foreman_discovery 16.3.6 → 17.0.0

data/locale/zh_TW/foreman_discovery.po

@@ -5,9 +5,9 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 16.2.0\n"
+"Project-Id-Version: foreman_discovery 16.3.4\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2020-05-26 17:21+0000\n"
+"PO-Revision-Date: 2021-01-25 08:35+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/foreman/foreman/lang"
 "uage/zh_TW/)\n"
@@ -20,9 +20,6 @@ msgstr ""
 msgid "%s - The following hosts are about to be changed"
 msgstr "%s - 以下主機即將受到更改"
 
-msgid "%s ago"
-msgstr "%s 之前"
-
 msgid "%s discovered hosts were provisioned"
 msgstr ""
 
@@ -33,7 +30,7 @@ msgid "A summary of discovered hosts"
 msgstr ""
 
 msgid "Action with sub plans"
-msgstr ""
+msgstr "有子計畫的動作"
 
 msgid "Actions"
 msgstr "動作"
@@ -80,6 +77,12 @@ msgstr ""
 msgid "Clean all reported facts during provisioning (except discovery facts)"
 msgstr ""
 
+msgid "Clone"
+msgstr ""
+
+msgid "Clone %s"
+msgstr ""
+
 msgid "Collapse All"
 msgstr "全部收回"
 
@@ -145,9 +148,15 @@ msgstr[1] ""
 msgid "Discovered Hosts"
 msgstr ""
 
+msgid "Discovered Rules"
+msgstr ""
+
 msgid "Discovered host '%{host}' has all NICs filtered out, filter: %{filter}"
 msgstr ""
 
+msgid "Discovered host reported from unknown subnet, communication will not be proxied."
+msgstr ""
+
 msgid "Discovered host: %s"
 msgstr "發現的主機：%s"
 
@@ -160,6 +169,9 @@ msgstr ""
 msgid "Discovered hosts from Foreman server at %{foreman_url}"
 msgstr ""
 
+msgid "Discovered hosts reported from unknown subnet are %s, communication will not be proxied."
+msgstr ""
+
 msgid "Discovered hosts summary"
 msgstr ""
 
@@ -226,6 +238,9 @@ msgstr "啟用"
 msgid "Enable rule '%s'?"
 msgstr ""
 
+msgid "Error message goes here"
+msgstr ""
+
 msgid "Error on existing NIC"
 msgstr ""
 
@@ -280,6 +295,9 @@ msgstr "刷新 %s 的詳情失敗"
 msgid "Failed to refresh facts for %{hostname} with error %{error_message}"
 msgstr ""
 
+msgid "For more information please see "
+msgstr ""
+
 msgid "Force DNS"
 msgstr ""
 
@@ -304,6 +322,9 @@ msgstr ""
 msgid "Host"
 msgstr "主機"
 
+msgid "Host %s has been dicovered"
+msgstr ""
+
 msgid "Host %{host} was provisioned with rule %{rule}"
 msgstr ""
 
@@ -324,10 +345,10 @@ msgid "Host of type %s can not be rebooted"
 msgstr ""
 
 msgid "Host's owner type"
-msgstr ""
+msgstr "主機的擁有者類型"
 
 msgid "Host's parameters (array or indexed hash)"
-msgstr ""
+msgstr "主機參數（陣列或索引過的雜湊）"
 
 msgid "Hostname facts"
 msgstr ""
@@ -378,10 +399,10 @@ msgid "Image API returned HTTP/%{code} with '%{body}"
 msgstr ""
 
 msgid "Import Puppet classes"
-msgstr ""
+msgstr "匯入 Puppet 類別"
 
 msgid "Import facts"
-msgstr ""
+msgstr "匯入詳情"
 
 msgid "In addition to @host attribute function rand for random integers is available. Examples:"
 msgstr ""
@@ -471,7 +492,7 @@ msgid "Name"
 msgstr "名稱"
 
 msgid "Name of the parameter"
-msgstr ""
+msgstr "參數名稱"
 
 msgid "Network"
 msgstr "網路"
@@ -482,6 +503,9 @@ msgstr ""
 msgid "New Discovery Rule"
 msgstr ""
 
+msgid "New hosts"
+msgstr ""
+
 msgid "New in the last 24 hours"
 msgstr ""
 
@@ -534,7 +558,7 @@ msgid "PXELinux template to be used when pinning a host to discovery"
 msgstr ""
 
 msgid "Parameter value"
-msgstr ""
+msgstr "參數值"
 
 msgid "Please Confirm"
 msgstr "請確認"
@@ -600,7 +624,7 @@ msgid "Reloading kernel on %s"
 msgstr ""
 
 msgid "Remote action:"
-msgstr ""
+msgstr "遠端動作："
 
 msgid "Reported in the last 7 days"
 msgstr ""
@@ -728,6 +752,9 @@ msgstr ""
 msgid "defines a pattern to assign human-readable hostnames to the matching hosts"
 msgstr ""
 
+msgid "documentation"
+msgstr ""
+
 msgid "enables to limit maximum amount of provisioned hosts per rule"
 msgstr ""
 
@@ -777,13 +804,13 @@ msgid "represents rule name shown to the users"
 msgstr ""
 
 msgid "required if host is managed and custom partition has not been defined"
-msgstr ""
+msgstr "若主機是個受管理的主機，並且尚未定義自訂分割區的話便需要"
 
 msgid "required if host is managed and value is not inherited from host group"
-msgstr ""
+msgstr "若主機是個受管理的主機，並且值不是由主機群組所繼承的話便需要"
 
 msgid "required if not imaged based provisioning and host is managed and value is not inherited from host group"
-msgstr ""
+msgstr "若不是基於映像檔的佈建，而主機受管理並且值並非由主機群組所繼承的話便需要"
 
 msgid "required if value is not inherited from host group or default password in settings"
 msgstr ""

data/package.json

@@ -21,15 +21,15 @@
     "url": "http://projects.theforeman.org/projects/foreman_discovery/issues"
   },
   "peerDependencies": {
-    "@theforeman/vendor": ">= 4.14.0"
+    "@theforeman/vendor": "^6.0.0"
   },
   "devDependencies": {
     "@babel/core": "^7.7.0",
-    "@theforeman/builder": "^4.14.0",
-    "@theforeman/eslint-plugin-foreman": "4.14.0",
-    "@theforeman/stories": "^4.14.0",
-    "@theforeman/test": "^4.14.0",
-    "@theforeman/vendor-dev": "^4.14.0",
+    "@theforeman/builder": "^6.0.0",
+    "@theforeman/eslint-plugin-foreman": "^6.0.0",
+    "@theforeman/stories": "^7.0.0",
+    "@theforeman/test": "^8.0.0",
+    "@theforeman/vendor-dev": "^6.0.0",
     "babel-eslint": "^10.0.3",
     "eslint": "^6.7.2",
     "prettier": "^1.19.1",

data/test/functional/api/v2/discovered_hosts_controller_test.rb

@@ -4,6 +4,8 @@ class Api::V2::DiscoveredHostsControllerTest < ActionController::TestCase
   include FactImporterIsolation
   allow_transactions_for_any_importer
 
+  alias_method  :blueprint, :failed_discovery_blueprint
+
   def switch_controller(klass)
     old_controller = @controller
     @controller = klass.new
@@ -26,6 +28,8 @@ class Api::V2::DiscoveredHostsControllerTest < ActionController::TestCase
     set_default_settings
     ::ForemanDiscovery::NodeAPI::PowerService.any_instance.stubs(:reboot).returns(true)
     ::ForemanDiscovery::HostConverter.stubs(:unused_ip_for_host)
+
+    assert blueprint
   end
 
   def test_get_index
@@ -206,4 +210,9 @@ class Api::V2::DiscoveredHostsControllerTest < ActionController::TestCase
     assert_response :success
   end
 
+  def test_failed_discovery_notification
+    bad_facts = { this_is: 'bad' }
+    post :facts, params: { facts: bad_facts }
+    assert_equal 1, Notification.all.count
+  end
 end

data/test/functional/discovery_rules_controller_test.rb

@@ -12,7 +12,6 @@ class DiscoveryRulesControllerTest < ActionController::TestCase
   test "reader role should get index" do
     get :index, params: {}, session: set_session_user_default_reader
     assert_response :success
-    assert_not_nil assigns(:discovery_rules)
   end
 
   test "should get new" do
@@ -72,6 +71,12 @@ class DiscoveryRulesControllerTest < ActionController::TestCase
     assert_redirected_to discovery_rules_path
   end
 
+  test 'clone' do
+    rule = FactoryBot.create(:discovery_rule)
+    get :clone, params: { :id => rule.id }, session: set_session_user
+    assert_template 'clone'
+  end
+
   private
 
   def initialize_host

data/test/integration/discovered_hosts_test.rb

@@ -3,6 +3,7 @@ require 'integration_test_helper'
 
 class DiscoveredHostsTest < IntegrationTestWithJavascript
   let(:discovered_host) { FactoryBot.create(:discovered_host, :with_facts) }
+  let(:subnet) { FactoryBot.create(:subnet_ipv4, :network => "192.168.100.0") }
   let(:discovered_hosts) { Host::Discovered.all }
 
   setup do
@@ -17,8 +18,9 @@ class DiscoveredHostsTest < IntegrationTestWithJavascript
     Host::Discovered.destroy_all
   end
 
-  describe 'Multiple host Reboot' do
-    test 'triggers reboot on all discovered_hosts' do
+  describe 'Perform host Reboot' do
+    test 'triggers reboot on a single discovered_host' do
+      Host::Discovered.any_instance.stubs(:subnet).returns(subnet)
       Host::Discovered.any_instance
                       .expects(:reboot)
                       .at_least(discovered_hosts.count)
@@ -29,24 +31,70 @@ class DiscoveredHostsTest < IntegrationTestWithJavascript
       assert page.has_text?('The following hosts are about to be changed')
       page.find_button('Submit').click
     end
+
+    test 'triggers reboot on all discovered_hosts' do
+      Host::Discovered.any_instance.stubs(:subnet).returns(subnet)
+      Host::Discovered.any_instance
+                      .expects(:reboot)
+                      .at_least(discovered_hosts.count)
+      select_all_hosts
+      page.find_link('Select Action').click
+      page.find_link('Reboot').click
+      wait_for_ajax
+      assert page.has_text?('The following hosts are about to be changed')
+      page.find_button('Submit').click
+    end
+
+    test 'shows warning for all hosts with missing subnet' do
+      select_all_hosts
+      page.find_link('Select Action').click
+      page.find_link('Auto Provision').click
+      wait_for_ajax
+      assert page.has_text?('The following hosts are about to be changed')
+      page.find_button('Submit').click
+      wait_for_ajax
+      assert page.has_text?("Discovered hosts reported from unknown subnet")
+    end
   end
 
-  describe 'Multiple host Autoprovision' do
-    test 'converts all discovered to managed hosts' do
+  describe 'Perform host Autoprovision' do
+    test 'converts single discovered to managed host' do
+      Host::Discovered.any_instance.stubs(:subnet).returns(subnet)
       select_host_checkbox(discovered_host.id)
       page.find_link('Select Action').click
       page.find_link('Auto Provision').click
       wait_for_ajax
       assert page.has_text?('The following hosts are about to be changed')
       page.find_button('Submit').click
+    end
+
+    test 'converts all discovered to managed hosts' do
+      Host::Discovered.any_instance.stubs(:subnet).returns(subnet)
+      select_all_hosts
+      page.find_link('Select Action').click
+      page.find_link('Auto Provision').click
+      wait_for_ajax
+      assert page.has_text?('The following hosts are about to be changed')
+      page.find_button('Submit').click
       wait_for_ajax
       assert page.has_text?('Discovered hosts are provisioning now')
     end
+
+    test 'shows warning for all hosts with missing subnet' do
+      select_all_hosts
+      page.find_link('Select Action').click
+      page.find_link('Auto Provision').click
+      wait_for_ajax
+      assert page.has_text?('The following hosts are about to be changed')
+      page.find_button('Submit').click
+      wait_for_ajax
+      assert page.has_text?("Discovered hosts reported from unknown subnet")
+    end
   end
 
   describe 'Delete hosts' do
     test 'it removes all hosts' do
-      select_host_checkbox(discovered_host.id)
+      select_all_hosts
       page.find_link('Select Action').click
       page.find_link('Delete').click
       wait_for_ajax

data/test/test_helper_discovery.rb

@@ -172,6 +172,11 @@ def discovered_notification_blueprint
                                    name: 'new_discovered_host')
 end
 
+def failed_discovery_blueprint
+  @blueprint ||= FactoryBot.create(:notification_blueprint,
+                                   name: 'failed_discovery')
+end
+
 def parse_json_fixture(filename, remove_root_element = false)
   raw = JSON.parse(File.read(File.expand_path(File.dirname(__FILE__) + "/facts/#{filename}.json")))
   remove_root_element ? raw['facts'] : raw

data/test/unit/discovery_rule_test.rb

@@ -155,7 +155,7 @@ class DiscoveryRuleTest < ActiveSupport::TestCase
       :search => "cpu_count > 1",
       :hostgroup_id => @hostgroup.id
     refute_valid rule
-    assert_equal "Host group organization #{organization_one.name} must also be associated to the discovery rule", rule.errors[:organizations].first
+    assert_equal "Host group organization #{organization_one.name} must also be associated to the discovery rule", rule.errors[:base].first
   end
 
   test "should enforce hostgroup organizations and locations" do
@@ -168,7 +168,7 @@ class DiscoveryRuleTest < ActiveSupport::TestCase
       :organization_ids => [organization_one.id],
       :location_ids => [location_one.id]
     refute_valid rule
-    assert_equal "Host group location #{loc.name} must also be associated to the discovery rule", rule.errors[:locations].first
+    assert_equal "Host group location #{loc.name} must also be associated to the discovery rule", rule.errors[:base].first
   end
 
   context 'auditing related to discovery rule' do
@@ -218,4 +218,26 @@ class DiscoveryRuleTest < ActiveSupport::TestCase
       assert_equal DiscoveryRule::STEP, second_new.priority - first_new.priority
     end
   end
+
+  context 'suggest next priority' do
+    setup do
+      @organization = FactoryBot.create(:organization)
+      @location = FactoryBot.create(:location)
+    end
+
+    test 'when there exists a discovery_rule of the given organization' do
+      hostgroup = FactoryBot.create(:hostgroup, organizations: [@organization], locations: [@location] )
+      discovery_rule = FactoryBot.create(:discovery_rule,
+        priority: rand(100),
+        hostgroup: hostgroup,
+        organizations: [@organization],
+        locations: [@location])
+
+      assert_equal DiscoveryRule.suggest_priority(@organization), (discovery_rule.priority + DiscoveryRule::STEP)
+    end
+
+    test 'when there is no discovery_rule of the given organization' do
+      assert_equal DiscoveryRule.suggest_priority(@organization), DiscoveryRule::STEP
+    end
+  end
 end

data/test/unit/fact_to_category_resolver_test.rb

@@ -0,0 +1,41 @@
+require_relative '../test_plugin_helper'
+
+class FactToCategoryResolverTest < ActiveSupport::TestCase
+  class FakePrimaryInterface < OpenStruct
+    def subnet
+      nil
+    end
+  end
+
+  setup do
+    interfaces = [{
+      identifier: 'eth0',
+      mac: 'aa:bb:cc:dd:ee:f1',
+      ip: '192.168.1.1',
+    }.with_indifferent_access]
+    facts = {
+      :macaddress_eth0 => 'aa:bb:cc:dd:ee:f1',
+      :ipaddress_eth0 => '192.168.1.1',
+      manufacturer: 'TEST-Creator',
+      hardwaremodel: 'TEST_X64',
+      bios_vendor: 'TEST_BIOS',
+    }.with_indifferent_access
+
+    @host = Host::Discovered.new(name: 'dummy')
+    @host.stubs(:facts_hash).returns(facts)
+    @host.stubs(:interfaces).returns(interfaces)
+    @host.stubs(:primary_interface).returns(FakePrimaryInterface.new)
+    @resolver = ForemanDiscovery::FactToCategoryResolver.new(@host)
+  end
+
+  test 'resolve facts to right category' do
+    categories = @resolver.categories
+    hardware_category = categories[2]
+    network_category = categories[3]
+    software_category = categories[4]
+
+    assert_equal hardware_category['hardwaremodel'], 'TEST_X64'
+    assert_equal network_category['ipaddress_eth0'], '192.168.1.1'
+    assert_equal software_category['bios_vendor'], 'TEST_BIOS'
+  end
+end

data/test/unit/ui_notifications/destroy_host_test.rb

@@ -21,13 +21,6 @@ class DestroyHostNotificationTest < ActiveSupport::TestCase
       ForemanDiscovery::UINotifications::NewHost.deliver!(host)
     end
     assert_equal 1, blueprint.notifications.count
-    assert_no_difference('blueprint.notifications.count') do
-      host = FactoryBot.create(:discovered_host)
-      ForemanDiscovery::UINotifications::NewHost.deliver!(host)
-    end
-    assert_no_difference('blueprint.notifications.count') do
-      Host::Discovered.all.last.destroy
-    end
     Host::Discovered.destroy_all
     assert_equal 0, blueprint.notifications.count
   end
@@ -55,9 +48,9 @@ class DestroyHostNotificationTest < ActiveSupport::TestCase
     ForemanDiscovery::UINotifications::NewHost.deliver!(host1)
     host2 = FactoryBot.create(:discovered_host)
     ForemanDiscovery::UINotifications::NewHost.deliver!(host2)
-    assert_equal 1, blueprint.notifications.count
+    assert_equal 2, blueprint.notifications.count
     new_host = ::ForemanDiscovery::HostConverter.to_managed(host1, false, false)
     assert new_host.save!
-    assert_equal 1, blueprint.notifications.count
+    assert_equal 2, blueprint.notifications.count
   end
 end

data/test/unit/ui_notifications/new_host_test.rb

@@ -16,14 +16,14 @@ class NewHostNotificationTest < ActiveSupport::TestCase
     end
   end
 
-  test 'multiple discovered hosts should generate only one notification' do
+  test 'multiple discovered hosts should generate multiple notifications' do
     host1 = FactoryBot.create :discovered_host
     ForemanDiscovery::UINotifications::NewHost.deliver!(host1)
     expired_at = blueprint.notifications.first.expired_at
     Time.any_instance.stubs(:utc).returns(expired_at + 1.hour)
     host2 = FactoryBot.create :discovered_host
     ForemanDiscovery::UINotifications::NewHost.deliver!(host2)
-    assert_equal 1, blueprint.notifications.count
-    assert_not_equal expired_at, blueprint.notifications.first.expired_at
+    assert_equal 2, blueprint.notifications.count
+    assert_not_equal expired_at, blueprint.notifications.last.expired_at
   end
 end

data/webpack/__mocks__/foremanReact/common/I18n.js

@@ -0,0 +1,3 @@
+export const translate = s => s;
+
+export const ngettext = s => s;

data/webpack/__mocks__/foremanReact/common/helpers.js

@@ -0,0 +1 @@
+export const foremanUrl = path => `${window.URL_PREFIX}${path}`;

data/webpack/__mocks__/foremanReact/common/index.js

@@ -0,0 +1,5 @@
+import EmptyStatePattern from '../components/common/EmptyState/EmptyStatePattern';
+import DefaultEmptyState from '../components/common/EmptyState/DefaultEmptyState';
+
+export default DefaultEmptyState;
+export { EmptyStatePattern };

data/webpack/__mocks__/foremanReact/components/common/EmptyState/DefaultEmptyState.js

@@ -0,0 +1,69 @@
+import React from 'react';
+import { useDispatch } from 'react-redux';
+import { push } from 'connected-react-router';
+import { Button } from '@patternfly/react-core';
+import EmptyStatePattern from './EmptyStatePattern';
+import { defaultEmptyStatePropTypes } from './EmptyStatePropTypes';
+
+const DefaultEmptyState = props => {
+  const {
+    icon,
+    iconType,
+    header,
+    description,
+    documentation,
+    action,
+    secondaryActions,
+  } = props;
+
+  const dispatch = useDispatch();
+  const actionButtonClickHandler = ({ url, onClick }) => {
+    if (onClick) onClick();
+    else if (url) dispatch(push(url));
+  };
+
+  const ActionButton = action ? (
+    <Button
+      component="a"
+      onClick={() => actionButtonClickHandler(action)}
+      variant="primary"
+    >
+      {action.title}
+    </Button>
+  ) : null;
+
+  const SecondaryButton = secondaryActions
+    ? secondaryActions.map(({ title, url, onClick }) => (
+        <Button
+          component="a"
+          key={`sec-button-${title}`}
+          onClick={() => actionButtonClickHandler({ url, onClick })}
+          variant="secondary"
+        >
+          {title}
+        </Button>
+      ))
+    : null;
+
+  return (
+    <EmptyStatePattern
+      icon={icon}
+      iconType={iconType}
+      header={header}
+      description={description}
+      documentation={documentation}
+      action={ActionButton}
+      secondaryActions={SecondaryButton}
+    />
+  );
+};
+
+DefaultEmptyState.propTypes = defaultEmptyStatePropTypes;
+
+DefaultEmptyState.defaultProps = {
+  icon: 'add-circle-o',
+  secondaryActions: [],
+  iconType: 'pf',
+};
+
+export default DefaultEmptyState;

data/webpack/__mocks__/foremanReact/components/common/EmptyState/EmptyStatePattern.js

@@ -0,0 +1,77 @@
+import React from 'react';
+import { Icon } from 'patternfly-react';
+import {
+  Title,
+  EmptyState,
+  EmptyStateVariant,
+  EmptyStateBody,
+  EmptyStateSecondaryActions,
+} from '@patternfly/react-core';
+import { emptyStatePatternPropTypes } from './EmptyStatePropTypes';
+import { translate as __ } from '../../../common/I18n';
+
+const EmptyStatePattern = props => {
+  const {
+    documentation,
+    action,
+    secondaryActions,
+    iconType,
+    icon,
+    header,
+    description,
+  } = props;
+
+  const DocumentationBlock = () => {
+    if (!documentation) {
+      return null;
+    }
+    // The documentation prop can also be a customized node
+    if (React.isValidElement(documentation)) {
+      return documentation;
+    }
+    const {
+      label = __('For more information please see '), // eslint-disable-line react/prop-types
+      buttonLabel = __('documentation'), // eslint-disable-line react/prop-types
+      url, // eslint-disable-line react/prop-types
+    } = documentation;
+    return (
+      <span>
+        {label}
+        <a href={url}>{buttonLabel}</a>
+      </span>
+    );
+  };
+
+  return (
+    <EmptyState variant={EmptyStateVariant.xl}>
+      <span className="empty-state-icon">
+        {/* TODO: Add pf4 icons, Redmine issue: #30865 */}
+        <Icon name={icon} type={iconType} size="2x" />
+      </span>
+      <Title headingLevel="h5" size="4xl">
+        {header}
+      </Title>
+      <EmptyStateBody>
+        <div className="empty-state-description">{description}</div>
+        <DocumentationBlock />
+      </EmptyStateBody>
+      {action}
+      <EmptyStateSecondaryActions>
+        {secondaryActions}
+      </EmptyStateSecondaryActions>
+    </EmptyState>
+  );
+};
+
+EmptyStatePattern.propTypes = emptyStatePatternPropTypes;
+
+EmptyStatePattern.defaultProps = {
+  icon: 'add-circle-o',
+  secondaryActions: [],
+  documentation: {
+    url: '#',
+  },
+  iconType: 'pf',
+};
+
+export default EmptyStatePattern;