hammer_cli_foreman 2.0.1 → 2.1.3

data/test/functional/host_test.rb

@@ -308,7 +308,10 @@ describe 'host update' do
       'organization_id' => '5',
       'location_id' => '5',
       'compute_attributes' => {},
-      'puppetclass_ids' => []
+      'puppetclass_ids' => [],
+      'owner_id' => '1',
+      'owner_name' => 'adminGroup',
+      'owner_type' => 'Usergroup'
     }
   end
 
@@ -384,6 +387,29 @@ describe 'host update' do
 
     assert_cmd(expected_result, result)
   end
+
+  it 'should update the host owner' do
+    params = ['--owner-type=Usergroup', '--owner=adminGroup']
+
+    api_expects_search(:usergroups, name: 'adminGroup').returns(
+        index_response([{ 'id' => '1' }])
+    )
+    api_expects(:hosts, :update, 'Update host with new owner').with_params(
+        'id' => '1', 'location_id' => 1, 'organization_id' => 1, 'host' => {
+        'owner_id' => '1', 'compute_attributes' => {}
+    }
+    ) do |par|
+      par['id'] == '1' &&
+          par['host']['owner_id'] == '1' &&
+          par['host']['compute_attributes'] == {}
+    end.returns(updated_host)
+
+    expected_result = success_result("Host updated.\n")
+
+    result = run_cmd(cmd + minimal_params + params)
+
+    assert_cmd(expected_result, result)
+  end
 end
 
 describe 'host config reports' do

data/test/functional/http_proxy_test.rb

@@ -64,9 +64,6 @@ describe 'httpproxy' do
     expected_result = success_result("Http proxy deleted.\n")
 
     result = run_cmd(%w(http-proxy delete --id 1))
-    # Skip this assertion until a version of awesome_print without warnings on Ruby 2.7 is available
-    if RUBY_VERSION < '2.7'
-      assert_cmd(expected_result, result)
-    end
+    assert_cmd(expected_result, result)
   end
 end

data/test/functional/mail_notification_test.rb

@@ -0,0 +1,57 @@
+require File.join(File.dirname(__FILE__), 'test_helper')
+
+describe 'mail_notification' do
+  describe 'list' do
+    before do
+      @cmd = %w[mail-notification list]
+      @mail_notifications = [{
+        id: 1,
+        name: 'config_summary',
+        description: 'A summary of eventful configuration management reports',
+        subscription_type: 'report'
+      }]
+    end
+
+    it 'should return a list of mail notifications' do
+      api_expects(:mail_notifications, :index, 'List mail notifications').returns(@mail_notifications)
+
+      output = IndexMatcher.new([
+                                  %w[ID NAME],
+                                  %w[1 config_summary]
+                                ])
+      expected_result = success_result(output)
+
+      result = run_cmd(@cmd)
+      assert_cmd(expected_result, result)
+    end
+  end
+
+  describe 'info' do
+    before do
+      @cmd = %w[mail-notification info]
+      @mail_notification = {
+        id: 1,
+        name: 'config_summary',
+        description: 'A summary of eventful configuration management reports',
+        subscription_type: 'report'
+      }
+    end
+
+    it 'should return the info of a mail notification' do
+      params = ['--id=1']
+      api_expects(:mail_notifications, :show, 'Info mail notification').returns(@mail_notification)
+
+      output = OutputMatcher.new([
+                                   'Id:                1',
+                                   'Name:              config_summary',
+                                   'Description:       A summary of eventful configuration management reports',
+                                   'Subscription type: report'
+                                 ])
+
+      expected_result = success_result(output)
+
+      result = run_cmd(@cmd + params)
+      assert_cmd(expected_result, result)
+    end
+  end
+end

data/test/functional/subnet/create_test.rb

@@ -14,13 +14,36 @@ module HammerCLIForeman
         params
       end
 
-      it 'allows minimal options' do
-        api_expects(:subnets, :create) do |par|
-          par['subnet']['name'] == 'net1'
-        end
+      it 'should print error on missing --mask or --prefix' do
+        params = ['--name=net1']
+        cmd = %w[subnet create]
+
+        expected_result = usage_error_result(
+          cmd,
+          'At least one of options --mask, --prefix is required.',
+          'Could not create the subnet'
+        )
+
+        api_expects_no_call
+        result = run_cmd(cmd + params)
+        assert_cmd(expected_result, result)
+      end
+
+      it 'allows minimal options with mask for IPv4' do
+        api_expects(:subnets, :create).with_params(subnet_params(mask: '255.255.255.0'))
         run_cmd(%w(subnet create --name net1 --network=192.168.122.0 --mask=255.255.255.0))
       end
 
+      it 'allows minimal options with prefix for IPv4' do
+        api_expects(:subnets, :create).with_params(subnet_params(mask: '255.255.255.0'))
+        run_cmd(%w(subnet create --name net1 --network=192.168.122.0 --prefix=24))
+      end
+
+      it 'allows minimal options with prefix for IPv6' do
+        api_expects(:subnets, :create).with_params(subnet_params(cidr: '96'))
+        run_cmd(%w(subnet create --name net1 --network-type=IPv6 --network='::ffff:c0a8:7a00' --prefix=96))
+      end
+
       it 'allows dhcp id' do
         api_expects(:subnets, :create).with_params(subnet_params(:dhcp_id => 1))
         run_cmd(%w(subnet create --name net1 --network=192.168.122.0 --mask=255.255.255.0 --dhcp-id 1))
@@ -91,7 +114,7 @@ module HammerCLIForeman
       it 'allows organization names' do
         api_expects(:organizations, :index) do |p|
           p[:search] == "name = \"org1\" or name = \"org2\""
-        end.returns(index_response([{'id' => 1}, {'id' => 2}])) 
+        end.returns(index_response([{'id' => 1}, {'id' => 2}]))
         api_expects(:subnets, :create).with_params(subnet_params(:organization_ids => [1, 2]))
         run_cmd(%w(subnet create --name net1 --network=192.168.122.0 --mask=255.255.255.0 --organizations org1,org2))
       end

data/test/functional/template_test.rb

@@ -131,7 +131,7 @@ describe 'template' do
     it 'should create new combination with warning' do
       params = ['create','--provisioning-template-id=10', '--hostgroup-id=1', '--environment-id=1']
       expected_result = success_result("Template combination created.\n")
-      expected_result.expected_err = "Warning: Option --environment-id is deprecated. Use --puppet-environment-id instead\n"
+      expected_result.expected_err = "Warning: Option --environment-id is deprecated. Use --puppet-environment[-id] instead\n"
       api_expects(:template_combinations, :create, 'Create template combination') do |params|
         params['provisioning_template_id'] == 10 &&
           params['hostgroup_id'] == 1 &&
@@ -160,7 +160,7 @@ describe 'template' do
     it 'should update combination with warning' do
       params = ['update', '--id=3', '--provisioning-template-id=10', '--hostgroup-id=1', '--environment-id=1']
       expected_result = success_result("Template combination updated.\n")
-      expected_result.expected_err = "Warning: Option --environment-id is deprecated. Use --puppet-environment-id instead\n"
+      expected_result.expected_err = "Warning: Option --environment-id is deprecated. Use --puppet-environment[-id] instead\n"
       api_expects(:template_combinations, :update, 'Update template combination') do |params|
         params['id'] == '3' &&
           params['provisioning_template_id'] == 10 &&

data/test/functional/user_mail_notification_test.rb

@@ -0,0 +1,89 @@
+require File.join(File.dirname(__FILE__), 'test_helper')
+
+describe 'user_mail_notification' do
+  before do
+    @user_mail_notifications = [{
+                                  id: 1,
+                                  user_id: 2,
+                                  mail_notification_id: 3,
+                                  interval: "Daily",
+                                  mail_query: "",
+                                  name: 'config_summary',
+                                  description: 'A summary of eventful configuration management reports'
+                                }]
+  end
+  describe 'list' do
+    before do
+      @cmd = %w[user mail-notification list]
+    end
+
+    it 'should return a list of the user mail notifications' do
+      params = ['--user-id=2']
+      api_expects(:mail_notifications, :user_mail_notifications, 'List user mail notifications').returns(@user_mail_notifications)
+
+      output = IndexMatcher.new([
+                                    ['ID', 'NAME', 'DESCRIPTION', 'INTERVAL', 'MAIL QUERY'],
+                                    ['3', 'config_summary', 'A summary of eventful configuration management reports', 'Daily', '']
+                                ])
+      expected_result = success_result(output)
+
+      result = run_cmd(@cmd + params)
+      assert_cmd(expected_result, result)
+    end
+  end
+
+  describe 'update' do
+    before do
+      @cmd = %w[user mail-notification update]
+    end
+
+    it 'should update a user mail notification' do
+      params = ['--user-id=2', '--mail-notification-id=3', '--interval=weekly']
+      api_expects(:mail_notifications, :update, 'Update user mail notification')
+
+      result = run_cmd(@cmd + params)
+      assert_cmd(success_result("User mail notifications was updated.\n"), result)
+    end
+  end
+
+  describe 'create' do
+    before do
+      @cmd = %w[user mail-notification add]
+    end
+
+    it 'should return an error that there is no mail-notification' do
+      params = ['--user-id=2']
+
+      expected_result = common_error_result(
+          @cmd,
+          "Could not find mail_notification, please set one of options --mail-notification, --mail-notification-id.",
+          "Could not add user mail notification"
+      )
+
+      result = run_cmd(@cmd + params)
+      assert_cmd(expected_result, result)
+    end
+
+    it 'should add a user mail notification' do
+      params = ['--user-id=2', '--mail-notification-id=3', '--interval=daily']
+      api_expects(:mail_notifications, :create, 'Create user mail notification')
+
+      result = run_cmd(@cmd + params)
+      assert_cmd(success_result("User mail notifications was added.\n"), result)
+    end
+  end
+
+  describe 'remove' do
+    before do
+      @cmd = %w[user mail-notification remove]
+    end
+
+    it 'should remove a user mail notification' do
+      params = ['--user-id=2', '--mail-notification-id=3']
+      api_expects(:mail_notifications, :destroy, 'Remove user mail notification')
+
+      result = run_cmd(@cmd + params)
+      assert_cmd(success_result("User mail notification was removed.\n"), result)
+    end
+  end
+end

data/test/functional/virtual_machine_test.rb

@@ -0,0 +1,129 @@
+
+require File.join(File.dirname(__FILE__), 'test_helper')
+
+require 'hammer_cli_foreman/compute_resource'
+
+describe HammerCLIForeman::VirtualMachine do
+
+  context "InfoCommand" do
+    before do
+      @cmd = ["compute-resource", "virtual-machine", "info"]
+      @vm = {
+          'id' => 1,
+          'name' => 'vm1',
+          'provider' => 'Ovirt',
+          'cpu' => 1,
+          'memory' => 1,
+          'status' => 'down'
+      }
+    end
+
+    it "should print error on missing --id and --vm-id" do
+      api_expects_no_call
+      result = run_cmd(@cmd)
+      assert_match("Missing arguments for '--id', '--vm-id'.\n", result.err)
+    end
+
+    it "should print error on missing --vm-id" do
+      params = ['--id=1']
+
+      api_expects_no_call
+      result = run_cmd(@cmd + params)
+      assert_match("Missing arguments for '--vm-id'.\n", result.err)
+    end
+
+    it "should return vm info" do
+      params = ['--id=1', '--vm-id=1']
+      api_expects(:compute_resources, :show_vm) do |par|
+        par['id'] == '1' && par['vm_id'] == '1'
+      end.returns(@vm)
+      result = run_cmd(@cmd + params)
+      assert_match("Id:     1\nName:   vm1\nCPUs:   1\nMemory: 1\nStatus: down\n\n", result.out)
+    end
+
+  end
+
+  context "ListCommand" do
+    before do
+      @cmd = ["compute-resource", "virtual-machines"]
+      @available_virtual_machines = [
+        { id: 1, name: 'vm1' },
+        { id: 2, name: 'vm2' }
+      ]
+    end
+
+    it "should print error on missing --id" do
+      api_expects_no_call
+      result = run_cmd(@cmd)
+      assert_match("Missing arguments for '--id'.\n", result.err)
+    end
+
+    it "should return vms list" do
+      params = ['--id=1']
+      api_expects(:compute_resources, :available_virtual_machines) do |par|
+        par['id'] == '1'
+      end.returns(@available_virtual_machines)
+      result = run_cmd(@cmd + params)
+      assert_match(/-----|---\nNAME | ID\n-----|---\nvm1  | 1 \nvm2  | 2 \n-----|---\n/, result.out)
+    end
+  end
+
+  context "PowerCommand" do
+    before do
+      @cmd = ["compute-resource", "virtual-machine", "power"]
+    end
+
+    it "should print error on missing --id and --vm-id" do
+      api_expects_no_call
+      result = run_cmd(@cmd)
+      assert_match("Could not power the virtual machine:\n  Missing arguments for '--id', '--vm-id'.\n", result.err)
+    end
+
+    it "should print error on missing --vm-id" do
+      params = ['--id=1']
+
+      api_expects_no_call
+      result = run_cmd(@cmd + params)
+      assert_match("Could not power the virtual machine:\n  Missing arguments for '--vm-id'.\n", result.err)
+    end
+
+    it 'should power a virtual machine' do
+      params = ['--id=1', '--vm-id=1']
+      api_expects(:compute_resources, :power_vm) do |par|
+        par['id'] == '1' && par['vm_id'] == '1'
+      end.returns({})
+      result = run_cmd(@cmd + params)
+      assert_cmd(success_result("Virtual machine is powering.\n"), result)
+    end
+  end
+
+  context "DeleteCommand" do
+    before do
+      @cmd = ["compute-resource", "virtual-machine", "delete"]
+    end
+
+    it "should print error on missing --id and --vm-id" do
+      api_expects_no_call
+      result = run_cmd(@cmd)
+      assert_match("Could not delete the virtual machine:\n  Missing arguments for '--id', '--vm-id'.\n", result.err)
+    end
+
+    it "should print error on missing --vm-id" do
+      params = ['--id=1']
+
+      api_expects_no_call
+      result = run_cmd(@cmd + params)
+      assert_match("Could not delete the virtual machine:\n  Missing arguments for '--vm-id'.\n", result.err)
+    end
+
+    it 'delete virtual machine' do
+      params = ['--id=1', '--vm-id=1']
+      api_expects(:compute_resources, :destroy_vm) do |par|
+        par['id'] == '1' && par['vm_id'] == '1'
+      end.returns({})
+      result = run_cmd(@cmd + params)
+      assert_cmd(success_result("Virtual machine deleted.\n"), result)
+    end
+  end
+
+end

data/test/test_helper.rb

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

data/test/unit/audit_test.rb

@@ -54,6 +54,7 @@ describe HammerCLIForeman::Audit do
         it_should_print_column "Audit type"
         it_should_print_column "Audit record"
         it_should_print_column "Audited changes"
+        it_should_print_column "Request UUID"
       end
     end
   end

data/test/unit/sessions_test.rb

@@ -13,7 +13,6 @@ describe HammerCLIForeman do
           HammerCLIForeman::Sessions.stubs(:storage).returns(dir)
           session = HammerCLIForeman::Sessions.get('http://example.com')
           session.id.must_be_nil
-          session.auth_type.must_be_nil
           session.user_name.must_be_nil
         end
       end
@@ -24,8 +23,7 @@ describe HammerCLIForeman do
           HammerCLIForeman::Sessions.stubs(:storage).returns(dir)
           session_content = {
             :id => '3040b0f04c3a35a499e6837278904d48',
-            :user_name => 'admin',
-            :auth_type => 'basic_auth'
+            :user_name => 'admin'
           }
           session_path = "#{dir}/http_example.com"
           File.open(session_path,"w") do |f|
@@ -35,7 +33,6 @@ describe HammerCLIForeman do
 
           session = HammerCLIForeman::Sessions.get('http://example.com')
           session.id.must_equal '3040b0f04c3a35a499e6837278904d48'
-          session.auth_type.must_equal 'basic_auth'
           session.user_name.must_equal 'admin'
         end
       end
@@ -67,8 +64,7 @@ describe HammerCLIForeman do
           HammerCLIForeman::Sessions.stubs(:storage).returns(dir)
           session_content = {
             :id => '3040b0f04c3a35a499e6837278904d48',
-            :user_name => 'admin',
-            :auth_type => 'basic_auth'
+            :user_name => 'admin'
           }
           session_path = "#{dir}/http_example.com"
           File.open(session_path,"w") do |f|
@@ -124,13 +120,11 @@ describe HammerCLIForeman do
       Tempfile.create('session') do |f|
         session = HammerCLIForeman::Session.new(f.path)
         session.id = '3040b0f04c3a35a499e6837278904d48'
-        session.auth_type = 'basic_auth'
         session.user_name = 'admin'
         session.store
 
         session = HammerCLIForeman::Session.new(f.path)
         session.id.must_equal '3040b0f04c3a35a499e6837278904d48'
-        session.auth_type.must_equal 'basic_auth'
         session.user_name.must_equal 'admin'
       end
     end
@@ -150,7 +144,6 @@ describe HammerCLIForeman do
         _, err = capture_io do
           session = HammerCLIForeman::Session.new(f.path)
           session.id = nil
-          session.auth_type = nil
           session.user_name = nil
         end
         err.must_equal("Invalid session data. Resetting the session.\n")
@@ -162,13 +155,11 @@ describe HammerCLIForeman do
         Tempfile.create('session') do |f|
           session = HammerCLIForeman::Session.new(f.path)
           session.id = '3040b0f04c3a35a499e6837278904d48'
-          session.auth_type = 'basic_auth'
           session.user_name = 'admin'
           session.destroy
 
           session = HammerCLIForeman::Session.new(f.path)
           session.id.must_be_nil
-          session.auth_type.must_equal 'basic_auth'
           session.user_name.must_equal 'admin'
         end
       end
@@ -179,7 +170,6 @@ describe HammerCLIForeman do
         Tempfile.create('session') do |f|
           session = HammerCLIForeman::Session.new(f.path)
           session.id = nil
-          session.auth_type = 'basic_auth'
           session.user_name = 'admin'
           session.valid?.must_equal false
         end
@@ -189,7 +179,6 @@ describe HammerCLIForeman do
         Tempfile.create('session') do |f|
           session = HammerCLIForeman::Session.new(f.path)
           session.id = '34252624635723572357234'
-          session.auth_type = 'basic_auth'
           session.user_name = 'admin'
           session.valid?.must_equal true
         end