openstack
/
os-collect-config
Code Issues Proposed changes

Add handling of a failing source. 

Also fix intermittent race with cfg.CONF
This commit is contained in:
Clint Byrum 2013-07-02 13:28:15 -07:00
parent 0c7f4dfb43
commit d78808a9a8
2 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
os_collect_config/collect.py
View File

@ -22,6 +22,7 @@ from os_collect_config import cache
from os_collect_config import cfn
from os_collect_config import common
from os_collect_config import ec2
from os_collect_config import exc
from oslo.config import cfg
opts = [
@ -66,7 +67,13 @@ def collect_all(collectors, store=False, requests_impl_map=None):
requests_impl = requests_impl_map[collector.name]
else:
requests_impl = common.requests
content = collector.Collector(requests_impl=requests_impl).collect()
try:
content = collector.Collector(
requests_impl=requests_impl).collect()
except exc.SourceNotAvailable:
logger.warn('Source [%s] Unavailable.' % collector.name)
continue
if store:
(changed, path) = cache.store(collector.name, content)

28
os_collect_config/tests/test_collect.py
View File

@ -13,6 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import copy
import extras
import fixtures
import json
@ -111,19 +112,21 @@ class TestCollectAll(testtools.TestCase):
self.useFixture(fixtures.FakeLogger())
collect.setup_conf()
self.cache_dir = self.useFixture(fixtures.TempDir())
self.clean_conf = copy.copy(cfg.CONF)
def restore_copy():
cfg.CONF = self.clean_conf
self.addCleanup(restore_copy)
cfg.CONF.cachedir = self.cache_dir.path
cfg.CONF.cfn.metadata_url = 'http://127.0.0.1:8000/'
cfg.CONF.cfn.stack_name = 'foo'
cfg.CONF.cfn.path = ['foo.Metadata']
self.addCleanup(cfg.CONF.reset)
def tearDown(self):
cfg.CONF.reset()
super(TestCollectAll, self).tearDown()
def _call_collect_all(self, store):
requests_impl_map = {'ec2': test_ec2.FakeRequests,
'cfn': test_cfn.FakeRequests(self)}
def _call_collect_all(self, store, requests_impl_map=None):
if requests_impl_map is None:
requests_impl_map = {'ec2': test_ec2.FakeRequests,
'cfn': test_cfn.FakeRequests(self)}
return collect.collect_all(
collect.COLLECTORS,
store=store,
@ -147,6 +150,15 @@ class TestCollectAll(testtools.TestCase):
self.assertIn(collector.name, content)
self.assertThat(content[collector.name], matchers.IsInstance(dict))
def test_collect_all_ec2_unavailable(self):
requests_impl_map = {'ec2': test_ec2.FakeFailRequests,
'cfn': test_cfn.FakeRequests(self)}
(any_changed, content) = self._call_collect_all(
store=False, requests_impl_map=requests_impl_map)
self.assertFalse(any_changed)
self.assertThat(content, matchers.IsInstance(dict))
self.assertNotIn('ec2', content)
class TestConf(testtools.TestCase):
def test_setup_conf(self):