diff options
| author | Zuul <zuul@review.opendev.org> | 2020-08-22 19:19:22 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-08-22 19:19:22 +0000 |
| commit | a8b865de9e37b80cccce0884359a796f10662f39 (patch) | |
| tree | 3a976dcd5d8978228406fef1bb3c2d04b4019e26 /ironic_python_agent | |
| parent | 82c7043f1aaad523cc8186fa5a212ce2c1498a64 (diff) | |
| parent | d50ff06b6bbf8909496882c7200c11299dc6b039 (diff) | |
| download | ironic-python-agent-a8b865de9e37b80cccce0884359a796f10662f39.tar.gz | |
Merge "Enable the logs collection by default"
Diffstat (limited to 'ironic_python_agent')
| -rw-r--r-- | ironic_python_agent/config.py | 2 | ||||
| -rw-r--r-- | ironic_python_agent/tests/unit/test_inspector.py | 16 |
2 files changed, 11 insertions, 7 deletions
diff --git a/ironic_python_agent/config.py b/ironic_python_agent/config.py index 9079d154..2c8105b1 100644 --- a/ironic_python_agent/config.py +++ b/ironic_python_agent/config.py @@ -23,7 +23,7 @@ CONF = cfg.CONF APARAMS = utils.get_agent_params() -INSPECTION_DEFAULT_COLLECTOR = 'default' +INSPECTION_DEFAULT_COLLECTOR = 'default,logs' INSPECTION_DEFAULT_DHCP_WAIT_TIMEOUT = 60 cli_opts = [ diff --git a/ironic_python_agent/tests/unit/test_inspector.py b/ironic_python_agent/tests/unit/test_inspector.py index c1fe2fc2..900a048a 100644 --- a/ironic_python_agent/tests/unit/test_inspector.py +++ b/ironic_python_agent/tests/unit/test_inspector.py @@ -49,10 +49,14 @@ class AcceptingFailure(mock.Mock): class TestMisc(base.IronicAgentTest): def test_default_collector_loadable(self): - ext = inspector.extension_manager( - [config.INSPECTION_DEFAULT_COLLECTOR]) - self.assertIs(ext[config.INSPECTION_DEFAULT_COLLECTOR].plugin, - inspector.collect_default) + defaults = config.INSPECTION_DEFAULT_COLLECTOR.split(',') + # default should go first + self.assertEqual('default', defaults[0]) + # logs much go last + self.assertEqual('logs', defaults[-1]) + ext = inspector.extension_manager(defaults) + for collector in defaults: + self.assertTrue(callable(ext[collector].plugin)) def test_raise_on_wrong_collector(self): self.assertRaisesRegex(errors.InspectionError, @@ -246,7 +250,7 @@ class TestCollectDefault(BaseDiscoverTest): self.assertEqual('boot:if', self.data['boot_interface']) self.assertEqual(self.inventory['disks'][2].name, self.data['root_disk'].name) - self.assertEqual({'collectors': ['default'], 'managers': mgrs}, + self.assertEqual({'collectors': ['default', 'logs'], 'managers': mgrs}, self.data['configuration']) mock_dispatch.assert_called_once_with('list_hardware_info') @@ -283,7 +287,7 @@ class TestCollectDefault(BaseDiscoverTest): self.assertEqual('boot:if', self.data['boot_interface']) self.assertNotIn('root_disk', self.data) - self.assertEqual({'collectors': ['default'], 'managers': mgrs}, + self.assertEqual({'collectors': ['default', 'logs'], 'managers': mgrs}, self.data['configuration']) mock_dispatch.assert_called_once_with('list_hardware_info') |