openstack
/
os-collect-config
Code Issues Proposed changes

Fix bugs and improve test coverage for cfn.

changes/54/35854/1
Clint Byrum 2013-07-02 00:47:02 -07:00
parent 7efd87df87
commit e10ce66791
2 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
os_collect_config/cfn.py
View File

@ -61,12 +61,13 @@ class CollectCfn(object):
field, sub_path = field.split('.', 1)
else:
sub_path = ''
params = {'Action': 'DescribeStackResource',
'Stackname': stack_name,
'LogicalResourceId': resource}
params = {'Action': 'DescribeStackResource',
'Stackname': stack_name,
'LogicalResourceId': resource}
try:
content = self._session.get(
url, params=params, headers=headers)
content.raise_for_status()
except self._requests_impl.exceptions.RequestException as e:
logger.warn(e)
raise exc.CfnMetadataNotAvailable

20
os_collect_config/tests/test_cfn.py
View File

@ -105,8 +105,28 @@ class TestCfn(testtools.TestCase):
self.assertRaises(exc.CfnMetadataNotConfigured, cfn_collect.collect)
self.assertIn('No path configured', self.log.output)
def test_collect_cfn_bad_path(self):
cfg.CONF.cfn.path = ['foo']
cfn_collect = cfn.CollectCfn(requests_impl=FakeRequests(self))
self.assertRaises(exc.CfnMetadataNotConfigured, cfn_collect.collect)
self.assertIn('Path not in format', self.log.output)
def test_collect_cfn_no_metadata_url(self):
cfg.CONF.cfn.metadata_url = None
cfn_collect = cfn.CollectCfn(requests_impl=FakeRequests(self))
self.assertRaises(exc.CfnMetadataNotConfigured, cfn_collect.collect)
self.assertIn('No metadata_url configured', self.log.output)
def test_collect_cfn_missing_sub_path(self):
cfg.CONF.cfn.path = ['foo.Metadata.not_there']
cfn_collect = cfn.CollectCfn(requests_impl=FakeRequests(self))
self.assertRaises(exc.CfnMetadataNotConfigured, cfn_collect.collect)
self.assertIn('Sub-path could not be found', self.log.output)
def test_collect_cfn_sub_path(self):
cfg.CONF.cfn.path = ['foo.Metadata.map_ab']
cfn_collect = cfn.CollectCfn(requests_impl=FakeRequests(self))
content = cfn_collect.collect()
self.assertThat(content, matchers.IsInstance(dict))
self.assertIn(u'b', content)
self.assertEquals(u'banana', content[u'b'])