hammer_cli_foreman 0.16.0 → 0.17.0

data/test/functional/compute_profile_test.rb

@@ -0,0 +1,99 @@
+require File.join(File.dirname(__FILE__), 'test_helper')
+describe "parameters" do
+
+  describe "create compute profile" do
+    before do
+      @cmd = ["compute-profile", "create"]
+    end
+    it 'should create a compute-profile' do
+      params = ['--name=newProfile']
+      api_expects(:compute_profiles, :create, 'Create Compute Profile') do |params|
+        (params['compute_profile']['name'] == 'newProfile')
+      end
+      result = run_cmd(@cmd + params)
+      assert_cmd(success_result("Compute profile created.\n"), result)
+    end
+  end
+
+  describe "update compute profile" do
+    before do
+        @cmd = ["compute-profile","update"]
+        @compute_profile =
+          {
+            "id": 1,
+            "name": "profile2",
+            "compute_attributes": [{
+                                     "id": 2,
+                                     "compute_resource_id": 3,
+                                     "compute_resource_name": "bla",
+                                     "provider_friendly_name": "oVirt",
+                                     "compute_profile_id": 1,
+                                     "compute_profile_name": "profile2",
+                                   }]
+          }
+    end
+    it 'update compute profile name' do
+      params = ['--id=1' ,'--new-name=profile2']
+      api_expects(:compute_profiles, :update, 'Update the compute profile').with_params({"name" =>"profile2"}).returns(@compute_profile)
+      result = run_cmd(@cmd + params)
+      assert_cmd(success_result("Compute profile updated.\n"), result)
+    end
+  end
+
+  describe "delete compute profile" do
+    before do
+      @cmd = ["compute-profile","delete"]
+      @compute_profile =
+        {
+          "id": 3,
+          "name": "profile3",
+          "compute_attributes": [{
+                                   "id": 4,
+                                   "compute_resource_id": 3,
+                                   "compute_resource_name": "bla",
+                                   "provider_friendly_name": "oVirt",
+                                   "compute_profile_id": 3,
+                                   "compute_profile_name": "profile3",
+                                 }]
+        }
+    end
+    it 'delete compute profile' do
+      params = ['--id=3']
+      api_expects(:compute_profiles, :destroy, :id => 3).returns({})
+      result = run_cmd(@cmd + params)
+      assert_cmd(success_result("Compute profile deleted.\n"), result)
+    end
+
+
+    it "should print error on missing --name or --id" do
+      params = []
+
+      expected_result = usage_error_result(
+        @cmd,
+        "At least one of options --name, --id is required.",
+        "Could not delete the Compute profile"
+      )
+
+      api_expects_no_call
+      result = run_cmd(@cmd + params)
+      assert_cmd(expected_result, result)
+    end
+
+    it "should print error when the compute profile doesn't exist" do
+      params = ['--id=200']
+
+      expected_result = not_found_error_result(
+        @cmd,
+        "Resource compute_profile not found by id '200'",
+        "Could not delete the Compute profile"
+      )
+      expected_message = "{ \"error\": {\"message\": \"Error: Resource compute_profile not found by id '200'\" }}"
+      response = HammerCLIForeman.foreman_api.api.send(:create_fake_response, 404,
+                                                       expected_message, "GET", "http://example.com/", {})
+      api_expects(:compute_profiles, :destroy, :id => 3).raises(RestClient::NotFound, response)
+      result = run_cmd(@cmd + params)
+      assert_cmd(expected_result, result)
+    end
+  end
+
+end

data/test/functional/compute_resource_test.rb

@@ -39,10 +39,9 @@ describe 'compute-resource' do
     end
 
     it 'should print error for incorrect/invalid --provider option' do
-      params = %w(--provider=unknown)
-
+      params = %w(--provider=unknown --name=new)
       expected_result = CommandExpectation.new
-      expected_result.expected_err = options_missing_error
+      expected_result.expected_err = "Could not create the compute resource:\n  incorrect/invalid --provider option\n"
       expected_result.expected_exit_code = HammerCLI::EX_USAGE
 
       api_expects_no_call
@@ -53,12 +52,10 @@ describe 'compute-resource' do
     end
 
     it 'should print error for blank --provider option' do
-      params = %w(--provider='')
-
+      params = %w(--provider= --name=new'')
       expected_result = CommandExpectation.new
-      expected_result.expected_err = options_missing_error
+      expected_result.expected_err = "Could not create the compute resource:\n  incorrect/invalid --provider option\n"
       expected_result.expected_exit_code = HammerCLI::EX_USAGE
-
       api_expects_no_call
 
       result = run_cmd(@cmd + params)
@@ -88,12 +85,12 @@ describe 'compute-resource' do
     end
 
     it 'should create a compute-resource' do
-      params = %w(--name=my-libvirt --provider=LibVirt --url=qemu+ssh://root@test.foreman.com")
+      params = %w(--name=my-libvirt --provider=LibVirt --url=qemu+ssh://root@test.foreman.com)
 
       api_expects(:compute_resources, :create, 'Create Compute Resource') do |params|
-        (params['compute_resource']['name'] = 'libvirt') &&
-          (params['compute_resource']['provider'] = 'libvirt') &&
-          (params['compute_resource']['url'] = 'qemu+ssh://root@test.foreman.com')
+        (params['compute_resource']['name'] == 'my-libvirt') &&
+          (params['compute_resource']['provider'] == 'LibVirt') &&
+          (params['compute_resource']['url'] == 'qemu+ssh://root@test.foreman.com')
       end
 
       result = run_cmd(@cmd + params)
@@ -110,19 +107,46 @@ describe 'compute-resource' do
                   --datacenter=ovirt.example.com)
 
       api_expects(:compute_resources, :create, 'Create Compute Resource') do |params|
-        (params['compute_resource']['name'] = 'test-ovirt') &&
-          (params['compute_resource']['provider'] = 'ovirt') &&
-          (params['compute_resource']['url'] = 'https://ovirt.example.com/ovirt-engine/api') &&
-          (params['compute_resource']['user'] = 'foreman') &&
-          (params['compute_resource']['password'] = 'changeme') &&
-          (params['compute_resource']['datacenter'] = 'ovirt.example.com')
+        (params['compute_resource']['name'] == 'test-ovirt') &&
+          (params['compute_resource']['provider'] == 'ovirt') &&
+          (params['compute_resource']['url'] == 'https://ovirt.example.com/ovirt-engine/api') &&
+          (params['compute_resource']['user'] == 'foreman') &&
+          (params['compute_resource']['password'] == 'changeme') &&
+          (params['compute_resource']['datacenter'] == 'ovirt.example.com')
       end
 
       result = run_cmd(@cmd + params)
 
       assert_cmd(success_result("Compute resource created.\n"), result)
     end
-  end
+
+
+    it 'should create a compute-resource ovirt with custom public key' do
+      tempfile = Tempfile.new('ca.pem')
+      tempfile << 'test data'
+      tempfile.close
+      params = %W(--name=test-ovirt
+                  --provider=ovirt
+                  --url=https://ovirt.example.com/ovirt-engine/api
+                  --user=foreman
+                  --password=changeme
+                  --datacenter=ovirt.example.com
+                  --public-key-path=#{tempfile.path})
+
+      api_expects(:compute_resources, :create, 'Create Compute Resource') do |params|
+        (params['compute_resource']['name'] =='test-ovirt') &&
+            (params['compute_resource']['provider'] == 'ovirt') &&
+            (params['compute_resource']['url'] == 'https://ovirt.example.com/ovirt-engine/api') &&
+            (params['compute_resource']['user'] == 'foreman') &&
+            (params['compute_resource']['password'] == 'changeme') &&
+            (params['compute_resource']['datacenter'] == 'ovirt.example.com' &&
+            (params['compute_resource']['public_key'] == 'test data'))
+      end
+      result = run_cmd(@cmd + params)
+
+      assert_cmd(success_result("Compute resource created.\n"), result)
+    end
+end
 
   describe 'clusters' do
     let(:cmd) { base_cmd << 'clusters' }

data/test/functional/location_test.rb

@@ -48,16 +48,16 @@ describe "parameters" do
       assert_cmd(expected_result, result)
     end
 
-
     it "should create new parameter" do
-      params = ['--name=A', '--value=1', '--location-id=3']
+      params = ['--name=A', '--value=1', '--parameter-type=integer', '--location-id=3']
 
       api_expects(:parameters, :index, 'Attempt find parameters') do |par|
         par['location_id'].to_i == 3
       end.returns(index_response([]))
       api_expects(:parameters, :create, 'Create parameter') do |par|
         par['parameter']['name'] == 'A' &&
-        par['parameter']['value'] == '1'
+        par['parameter']['value'] == '1' &&
+        par['parameter']['parameter_type'] == 'integer'
       end.returns({:name => 'A', :value => '1'})
 
       result = run_cmd(@cmd + params)
@@ -66,7 +66,7 @@ describe "parameters" do
 
 
     it "should update existing parameter" do
-      params = ['--name=A', '--value=1', '--location-id=3']
+      params = ['--name=A', '--value=1', '--parameter-type=integer', '--location-id=3']
 
       api_expects(:parameters, :index, 'Find parameter') do |par|
         par['location_id'].to_i == 3
@@ -74,7 +74,8 @@ describe "parameters" do
       api_expects(:parameters, :update, 'Update parameter') do |par|
         par['id'].to_i == 15 &&
         par['location_id'].to_i == 3 &&
-        par['parameter']['value'] == '1'
+        par['parameter']['value'] == '1' &&
+        par['parameter']['parameter_type'] == 'integer'
       end.returns({:name => 'A', :value => '1'})
 
       result = run_cmd(@cmd + params)

data/test/functional/organization_test.rb

@@ -48,16 +48,16 @@ describe "parameters" do
       assert_cmd(expected_result, result)
     end
 
-
     it "should create new parameter" do
-      params = ['--name=A', '--value=1', '--organization-id=3']
+      params = ['--name=A', '--value=1', '--parameter-type=integer', '--organization-id=3']
 
       api_expects(:parameters, :index, 'Attempt find parameters') do |par|
         par['organization_id'].to_i == 3
       end.returns(index_response([]))
       api_expects(:parameters, :create, 'Create parameter') do |par|
         par['parameter']['name'] == 'A' &&
-        par['parameter']['value'] == '1'
+        par['parameter']['value'] == '1' &&
+        par['parameter']['parameter_type'] == 'integer'
       end.returns({:name => 'A', :value => '1'})
 
       result = run_cmd(@cmd + params)
@@ -66,7 +66,7 @@ describe "parameters" do
 
 
     it "should update existing parameter" do
-      params = ['--name=A', '--value=1', '--organization-id=3']
+      params = ['--name=A', '--value=1', '--parameter-type=integer', '--organization-id=3']
 
       api_expects(:parameters, :index, 'Find parameter') do |par|
         par['organization_id'].to_i == 3
@@ -74,7 +74,8 @@ describe "parameters" do
       api_expects(:parameters, :update, 'Update parameter') do |par|
         par['id'].to_i == 15 &&
         par['organization_id'].to_i == 3 &&
-        par['parameter']['value'] == '1'
+        par['parameter']['value'] == '1' &&
+        par['parameter']['parameter_type'] == 'integer'
       end.returns({:name => 'A', :value => '1'})
 
       result = run_cmd(@cmd + params)

data/test/functional/report_template_test.rb

@@ -219,17 +219,25 @@ describe 'report-template' do
     end
   end
 
+  let(:generated_report_response) do
+    response = mock('ReportResponse')
+    response.stubs(:code).returns(200)
+    response.stubs(:body).returns('Report')
+    response.stubs(:headers).returns({:content_disposition => "filename=\"#{File.basename(tempfile.path)}\""})
+    response
+  end
+  let(:report_not_ready_response) do
+    mock('NoDataResponse', code: 204)
+  end
+
   describe 'generate' do
     let(:cmd) { %w(report-template generate) }
     let(:tempfile) { Tempfile.new('template', '/tmp') }
 
     it 'generates the report to the file' do
       params = ['--id=3', '--path=/tmp', '--inputs=Host filter=filter']
-      response = mock()
-      response.stubs(:body).returns('Report')
-      response.stubs(:headers).returns({:content_disposition => "filename=\"#{File.basename(tempfile.path)}\""})
       api_expects(:report_templates, :generate, 'Generate').with_params(
-        'id' => '3', "input_values" => {"Host filter" => "filter"}).returns(response)
+        'id' => '3', "input_values" => {"Host filter" => "filter"}).returns(generated_report_response)
 
       output = OutputMatcher.new("The response has been saved to #{tempfile.path}")
       expected_result = success_result(output)
@@ -240,10 +248,8 @@ describe 'report-template' do
 
     it 'generates the report to stdout' do
       params = ['--id=3', '--inputs=Host filter=filter']
-      response = mock()
-      response.stubs(:body).returns('Report')
       api_expects(:report_templates, :generate, 'Generate').with_params(
-        'id' => '3', "input_values" => {"Host filter" => "filter"}).returns(response)
+        'id' => '3', "input_values" => {"Host filter" => "filter"}).returns(generated_report_response)
 
       output = OutputMatcher.new('Report')
       expected_result = success_result(output)
@@ -251,4 +257,98 @@ describe 'report-template' do
       assert_cmd(expected_result, result)
     end
   end
+
+  describe 'schedule' do
+    let(:cmd) { %w(report-template schedule) }
+    let(:tempfile) { Tempfile.new('template', '/tmp') }
+
+    let(:schedule_response) do
+      job_id = 'JOB-UNIQUE-ID'
+      { 'job_id' => job_id, 'data_url' => "/report_data/#{job_id}" }
+    end
+
+    context 'without --wait' do
+      it 'schedule report and prints out data for getting the result' do
+        params = ['--id=3', '--inputs=Host filter=filter']
+        api_expects(:report_templates, :schedule_report, 'Schedule').with_params(
+          'id' => '3', "input_values" => {"Host filter" => "filter"}).returns(schedule_response)
+
+        output = OutputMatcher.new(schedule_response['job_id'])
+        expected_result = success_result(output)
+        result = run_cmd(cmd + params)
+        assert_cmd(expected_result, result)
+      end
+    end
+
+    context 'with --wait' do
+      it 'generates the report to the file' do
+        params = ['--id=3', '--inputs=Host filter=filter', '--wait', '--path=/tmp']
+        api_expects(:report_templates, :schedule_report, 'Schedule').with_params(
+          'id' => '3', "input_values" => {"Host filter" => "filter"}).returns(schedule_response)
+        api_expects(:report_templates, :report_data, 'Download report').with_params(
+          'id' => '3', 'job_id' => 'JOB-UNIQUE-ID').returns(generated_report_response)
+
+        output = OutputMatcher.new("The response has been saved to #{tempfile.path}")
+        expected_result = success_result(output)
+        result = run_cmd(cmd + params)
+        assert_cmd(expected_result, result)
+        assert_equal('Report', tempfile.read)
+      end
+
+      it 'generates the report to stdout' do
+        params = ['--id=3', '--inputs=Host filter=filter', '--wait']
+        api_expects(:report_templates, :schedule_report, 'Schedule').with_params(
+          'id' => '3', "input_values" => {"Host filter" => "filter"}).returns(schedule_response)
+        api_expects(:report_templates, :report_data, 'Download report').with_params(
+          'id' => '3', 'job_id' => 'JOB-UNIQUE-ID').returns(generated_report_response)
+
+        output = OutputMatcher.new('Report')
+        expected_result = success_result(output)
+        result = run_cmd(cmd + params)
+        assert_cmd(expected_result, result)
+      end
+
+      it 'polls for report while not ready' do
+        params = ['--id=3', '--inputs=Host filter=filter', '--wait']
+        api_expects(:report_templates, :schedule_report, 'Schedule').with_params(
+          'id' => '3', "input_values" => {"Host filter" => "filter"}).returns(schedule_response)
+        api_expects(:report_templates, :report_data, 'No data first, download second call')
+          .twice.with_params('id' => '3', 'job_id' => 'JOB-UNIQUE-ID')
+          .returns(report_not_ready_response)
+          .then.returns(generated_report_response)
+
+        output = OutputMatcher.new('Report')
+        expected_result = success_result(output)
+        result = run_cmd(cmd + params)
+        assert_cmd(expected_result, result)
+      end
+    end
+  end
+
+  describe 'report-data' do
+    let(:cmd) { %w(report-template report-data) }
+    let(:tempfile) { Tempfile.new('template', '/tmp') }
+    let(:params) { ['--id=3', '--path=/tmp', '--job-id=JOB-UNIQUE-ID'] }
+
+    it 'download data if ready' do
+      api_expects(:report_templates, :report_data, 'Download report').with_params(
+        'id' => '3', 'job_id' => 'JOB-UNIQUE-ID').returns(generated_report_response)
+
+      output = OutputMatcher.new("The response has been saved to #{tempfile.path}")
+      expected_result = success_result(output)
+      result = run_cmd(cmd + params)
+      assert_cmd(expected_result, result)
+      assert_equal('Report', tempfile.read)
+    end
+
+    it 'let user know data are not ready' do
+      api_expects(:report_templates, :report_data, 'Download report').with_params(
+        'id' => '3', 'job_id' => 'JOB-UNIQUE-ID').returns(report_not_ready_response)
+
+      output = OutputMatcher.new("The report is not ready yet.")
+      expected_result = CommandExpectation.new(output, '', HammerCLI::EX_TEMPFAIL)
+      result = run_cmd(cmd + params)
+      assert_cmd(expected_result, result)
+    end
+  end
 end

data/test/test_helper.rb

@@ -17,7 +17,7 @@ require "mocha/setup"
 require 'hammer_cli'
 require 'hammer_cli_foreman/testing/api_expectations'
 
-FOREMAN_VERSION = Gem::Version.new(ENV['TEST_API_VERSION'] || '1.20')
+FOREMAN_VERSION = Gem::Version.new(ENV['TEST_API_VERSION'] || '1.22')
 
 include HammerCLIForeman::Testing::APIExpectations
 HammerCLI.context[:api_connection].create('foreman') do

data/test/unit/common_parameter_test.rb

@@ -23,7 +23,7 @@ describe HammerCLIForeman::CommonParameter do
       let(:expected_record_count) { count_records(cmd.resource.call(:index)) }
 
       it_should_print_n_records
-      it_should_print_columns  ["Name", "Value"]
+      it_should_print_columns  ["Name", "Value", "Type"]
     end
 
   end
@@ -37,7 +37,7 @@ describe HammerCLIForeman::CommonParameter do
     let(:cmd) { HammerCLIForeman::CommonParameter::SetCommand.new("", ctx) }
 
     context "parameters" do
-      it_should_accept "name, value and hidden-value", ["--name=param", "--value=val", "--hidden-value=true"]
+      it_should_accept "name, value, parameter-type and hidden-value", ["--name=param", "--value=val", "--parameter-type=string", "--hidden-value=true"]
       # it_should_fail_with "name missing", ["--value=val"]
       # it_should_fail_with "value missing", ["--name=param"]
       # TODO: temporarily disabled, parameters are checked by the api
@@ -48,8 +48,8 @@ describe HammerCLIForeman::CommonParameter do
         ResourceMocks.mock_action_calls(
           [:common_parameters, :index, []],
           [:common_parameters, :create,
-            {"id" => 1, "name" => "param", "value" => "val", "hidden-value" => false},
-            {'common_parameter' => {'name' => 'param', 'value' => 'val', 'hidden_value' => false}, 'id' => 'param'}])
+            {"id" => 1, "name" => "param", "value" => "val", "parameter-type" => "string", "hidden-value" => false},
+            {'common_parameter' => {'name' => 'param', 'value' => 'val', 'parameter_type' => 'string', 'hidden_value' => false}, 'id' => 'param'}])
       end
       with_params ["--name=param", "--value=val", "--hidden-value=false"] do
         it_should_output "Created parameter [param] with value [val].,1,param", :csv
@@ -62,7 +62,7 @@ describe HammerCLIForeman::CommonParameter do
           [:common_parameters, :index, [{'name' => 'param', 'value' => 'test'}]],
           [:common_parameters, :update,
             {"id" => 1, "name" => "param", "value" => "val", "hidden-value" => false},
-            {'common_parameter' => {'name' => 'param', 'value' => 'val', 'hidden_value' => false}, 'id' => 'param'}])
+            {'common_parameter' => {'name' => 'param', 'value' => 'val', 'parameter_type' => 'string', 'hidden_value' => false}, 'id' => 'param'}])
       end
 
       with_params ["--name=param", "--value=val", "--hidden-value=false"] do
@@ -70,6 +70,18 @@ describe HammerCLIForeman::CommonParameter do
       end
     end
 
+    context "adding params with parameter type" do
+      before :each do
+        ResourceMocks.mock_action_calls(
+          [:common_parameters, :index, []],
+          [:common_parameters, :create,
+            {"id" => 2, "name" => "xyz", "value" => "1", "parameter-type" => "integer", "hidden-value" => false},
+            {'common_parameter' => {'name' => 'xyz', 'value' => '1', 'parameter_type' => 'integer', 'hidden_value' => false}, 'id' => 'xyz'}])
+      end
+      with_params ["--name=xyz", "--value=1", "--parameter-type=integer", "--hidden-value=false"] do
+        it_should_output "Created parameter [xyz] with value [1].,2,xyz", :csv
+      end
+    end
   end