openstack/os-collect-config
Code Issues Proposed changes

Enable local collector by default

Browse Source 
This is a useful collector and it seems odd to not have it on by
default.

Change-Id: Ibc3be6ff27c6290ce32bc01d0e62acf3253545c3
This commit is contained in:
Gregory Haynes 2014-10-28 09:50:36 -07:00
parent 72bd2854f6
commit 46e950ddd1
3 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
os_collect_config/collect.py
View File

@ -35,7 +35,7 @@ from os_collect_config import request
from os_collect_config import version from os_collect_config import version
from oslo.config import cfg from oslo.config import cfg
DEFAULT_COLLECTORS = ['heat_local', 'ec2', 'cfn', 'heat', 'request'] DEFAULT_COLLECTORS = ['heat_local', 'ec2', 'cfn', 'heat', 'request', 'local']
opts = [ opts = [
cfg.StrOpt('command', short='c', cfg.StrOpt('command', short='c',
help='Command to run on metadata changes. If specified,' help='Command to run on metadata changes. If specified,'

2
os_collect_config/local.py
View File

@ -62,7 +62,7 @@ class Collector(object):
try: try:
os.stat(local_path) os.stat(local_path)
except OSError: except OSError:
logger.warning("%s not found. Skipping", local_path) logger.warn("%s not found. Skipping", local_path)
continue continue
if _dest_looks_insecure(local_path): if _dest_looks_insecure(local_path):
raise exc.LocalMetadataNotAvailable raise exc.LocalMetadataNotAvailable

33
os_collect_config/tests/test_collect.py
View File

@ -35,10 +35,11 @@ from os_collect_config.tests import test_cfn
from os_collect_config.tests import test_ec2 from os_collect_config.tests import test_ec2
from os_collect_config.tests import test_heat from os_collect_config.tests import test_heat
from os_collect_config.tests import test_heat_local from os_collect_config.tests import test_heat_local
from os_collect_config.tests import test_local
from os_collect_config.tests import test_request from os_collect_config.tests import test_request
def _setup_local_metadata(test_case): def _setup_heat_local_metadata(test_case):
test_case.useFixture(fixtures.NestedTempfile()) test_case.useFixture(fixtures.NestedTempfile())
local_md = tempfile.NamedTemporaryFile(delete=False) local_md = tempfile.NamedTemporaryFile(delete=False)
local_md.write(json.dumps(test_heat_local.META_DATA).encode('utf-8')) local_md.write(json.dumps(test_heat_local.META_DATA).encode('utf-8'))
@ -46,6 +47,15 @@ def _setup_local_metadata(test_case):
return local_md.name return local_md.name
def _setup_local_metadata(test_case):
tmpdir = fixtures.TempDir()
test_case.useFixture(tmpdir)
local_data_path = tmpdir.path + '/local'
with open(local_data_path, 'w') as local_data:
json.dump(test_local.META_DATA, local_data)
return tmpdir.path
class TestCollect(testtools.TestCase): class TestCollect(testtools.TestCase):
def setUp(self): def setUp(self):
@ -84,7 +94,7 @@ class TestCollect(testtools.TestCase):
expected_cmd = self.getUniqueString() expected_cmd = self.getUniqueString()
cache_dir = self.useFixture(fixtures.TempDir()) cache_dir = self.useFixture(fixtures.TempDir())
backup_cache_dir = self.useFixture(fixtures.TempDir()) backup_cache_dir = self.useFixture(fixtures.TempDir())
fake_metadata = _setup_local_metadata(self) fake_metadata = _setup_heat_local_metadata(self)
occ_args = [ occ_args = [
'os-collect-config', 'os-collect-config',
'--command', '--command',
@ -146,7 +156,7 @@ class TestCollect(testtools.TestCase):
self.assertIn("map_ab", keys_found) self.assertIn("map_ab", keys_found)
def test_main_just_local(self): def test_main_just_local(self):
fake_md = _setup_local_metadata(self) fake_md = _setup_heat_local_metadata(self)
occ_args = [ occ_args = [
'os-collect-config', 'os-collect-config',
'--print', '--print',
@ -158,7 +168,7 @@ class TestCollect(testtools.TestCase):
def test_main_force_command(self): def test_main_force_command(self):
cache_dir = self.useFixture(fixtures.TempDir()) cache_dir = self.useFixture(fixtures.TempDir())
backup_cache_dir = self.useFixture(fixtures.TempDir()) backup_cache_dir = self.useFixture(fixtures.TempDir())
fake_metadata = _setup_local_metadata(self) fake_metadata = _setup_heat_local_metadata(self)
occ_args = [ occ_args = [
'os-collect-config', 'os-collect-config',
'--command', 'foo', '--command', 'foo',
@ -178,7 +188,7 @@ class TestCollect(testtools.TestCase):
def test_main_command_failed_no_caching(self): def test_main_command_failed_no_caching(self):
cache_dir = self.useFixture(fixtures.TempDir()) cache_dir = self.useFixture(fixtures.TempDir())
backup_cache_dir = self.useFixture(fixtures.TempDir()) backup_cache_dir = self.useFixture(fixtures.TempDir())
fake_metadata = _setup_local_metadata(self) fake_metadata = _setup_heat_local_metadata(self)
occ_args = [ occ_args = [
'os-collect-config', 'os-collect-config',
'--command', '--command',
@ -220,7 +230,7 @@ class TestCollect(testtools.TestCase):
'--cfn-secret-access-key', '--cfn-secret-access-key',
'FEDCBA9876543210', 'FEDCBA9876543210',
] ]
fake_metadata = _setup_local_metadata(self) fake_metadata = _setup_heat_local_metadata(self)
fake_args.append('--heat_local-path') fake_args.append('--heat_local-path')
fake_args.append(fake_metadata) fake_args.append(fake_metadata)
output = self.useFixture(fixtures.StringStream('stdout')) output = self.useFixture(fixtures.StringStream('stdout'))
@ -251,7 +261,7 @@ class TestCollect(testtools.TestCase):
def test_main_print_only(self): def test_main_print_only(self):
cache_dir = self.useFixture(fixtures.TempDir()) cache_dir = self.useFixture(fixtures.TempDir())
backup_cache_dir = self.useFixture(fixtures.TempDir()) backup_cache_dir = self.useFixture(fixtures.TempDir())
fake_metadata = _setup_local_metadata(self) fake_metadata = _setup_heat_local_metadata(self)
args = [ args = [
'os-collect-config', 'os-collect-config',
'--command', 'bar', '--command', 'bar',
@ -333,13 +343,14 @@ class TestCollectAll(testtools.TestCase):
cfg.CONF.cfn.path = ['foo.Metadata'] cfg.CONF.cfn.path = ['foo.Metadata']
cfg.CONF.cfn.access_key_id = '0123456789ABCDEF' cfg.CONF.cfn.access_key_id = '0123456789ABCDEF'
cfg.CONF.cfn.secret_access_key = 'FEDCBA9876543210' cfg.CONF.cfn.secret_access_key = 'FEDCBA9876543210'
cfg.CONF.heat_local.path = [_setup_local_metadata(self)] cfg.CONF.heat_local.path = [_setup_heat_local_metadata(self)]
cfg.CONF.heat.auth_url = 'http://127.0.0.1:5000/v3' cfg.CONF.heat.auth_url = 'http://127.0.0.1:5000/v3'
cfg.CONF.heat.user_id = '0123456789ABCDEF' cfg.CONF.heat.user_id = '0123456789ABCDEF'
cfg.CONF.heat.password = 'FEDCBA9876543210' cfg.CONF.heat.password = 'FEDCBA9876543210'
cfg.CONF.heat.project_id = '9f6b09df-4d7f-4a33-8ec3-9924d8f46f10' cfg.CONF.heat.project_id = '9f6b09df-4d7f-4a33-8ec3-9924d8f46f10'
cfg.CONF.heat.stack_id = 'a/c482680f-7238-403d-8f76-36acf0c8e0aa' cfg.CONF.heat.stack_id = 'a/c482680f-7238-403d-8f76-36acf0c8e0aa'
cfg.CONF.heat.resource_name = 'server' cfg.CONF.heat.resource_name = 'server'
cfg.CONF.local.path = [_setup_local_metadata(self)]
cfg.CONF.request.metadata_url = 'http://127.0.0.1:8000/my_metadata/' cfg.CONF.request.metadata_url = 'http://127.0.0.1:8000/my_metadata/'
@mock.patch.object(ks_discover.Discover, '__init__') @mock.patch.object(ks_discover.Discover, '__init__')
@ -370,8 +381,8 @@ class TestCollectAll(testtools.TestCase):
(changed_keys, paths) = self._call_collect_all( (changed_keys, paths) = self._call_collect_all(
store=True, collector_kwargs_map=collector_kwargs_map) store=True, collector_kwargs_map=collector_kwargs_map)
if expected_changed is None: if expected_changed is None:
expected_changed = set( expected_changed = set(['heat_local', 'cfn', 'ec2',
['heat_local', 'cfn', 'ec2', 'heat', 'request']) 'heat', 'local', 'request'])
self.assertEqual(expected_changed, changed_keys) self.assertEqual(expected_changed, changed_keys)
self.assertThat(paths, matchers.IsInstance(list)) self.assertThat(paths, matchers.IsInstance(list))
for path in paths: for path in paths:
@ -393,7 +404,7 @@ class TestCollectAll(testtools.TestCase):
'request': {'requests_impl': test_request.FakeRequests}, 'request': {'requests_impl': test_request.FakeRequests},
} }
expected_changed = set(( expected_changed = set((
'heat_local', 'ec2', 'cfn', 'heat', 'request', 'heat_local', 'ec2', 'cfn', 'heat', 'local', 'request',
'dep-name1', 'dep-name2', 'dep-name3')) 'dep-name1', 'dep-name2', 'dep-name3'))
self._test_collect_all_store(collector_kwargs_map=soft_config_map, self._test_collect_all_store(collector_kwargs_map=soft_config_map,
expected_changed=expected_changed) expected_changed=expected_changed)