openstack/monasca-agent
Code Issues Proposed changes

Certificate check detection plugin fails to log error

Browse Source 
Certificate check detection plugin fails to log error when timeout is
less than or equal to 0.0. This patch provides the fix. Unit test is
also been added with this patch.

Change-Id: Id5c026d58d91c57a8d9fd614667862dd81cd4cd6
Closes-Bug: #1593121
This commit is contained in:
Gandharva 2016-06-18 03:19:33 +05:30
parent 66a0f1fade
commit bb48b28abd
2 changed files with 83 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
monasca_setup/detection/plugins/cert_check.py
View File

@ -60,7 +60,7 @@ class CertificateCheck(monasca_setup.detection.ArgsPlugin):
if 'timeout' in self.args:
timeout = float(self.args['timeout'])
if timeout <= 0.0:
log.error('Invalid timeout value {}, ignoring' %
log.error('Invalid timeout value %s, ignoring' %
self.args['timeout'])
else:
init_config['timeout'] = timeout

82
tests/detection/test_cert_check.py Normal file
View File

@ -0,0 +1,82 @@
# (C) Copyright 2016 Hewlett Packard Enterprise Development Company LP
import logging
import unittest
from mock import patch
from monasca_setup.detection.plugins.cert_check import CertificateCheck
LOG = logging.getLogger('monasca_setup.detection.plugins.cert_check')
class TestCertCheck(unittest.TestCase):
def setUp(self):
unittest.TestCase.setUp(self)
with patch.object(CertificateCheck, '_detect') as mock_detect:
self.cert_obj = CertificateCheck('temp_dir')
self.assertTrue(mock_detect.called)
self.cert_obj.args = {'urls': 'http://fake-cert.com'}
def test_detect(self):
self.cert_obj.available = False
with patch.object(self.cert_obj, '_check_required_args',
return_value=True) as mock_check_required_args:
self.cert_obj._detect()
self.assertTrue(self.cert_obj.available)
self.assertTrue(mock_check_required_args.called)
def _build_config(self):
with patch.object(self.cert_obj, '_build_instance',
return_value={}) as mock_build_instance:
result = self.cert_obj.build_config()
self.assertTrue(mock_build_instance.called)
self.assertEqual(result['cert_check']['instances'][0]['url'],
'http://fake-cert.com')
self.assertEqual(result['cert_check']['instances'][0]['name'],
'http://fake-cert.com')
return result
def test_build_config_without_args(self):
result = self._build_config()
self.assertEqual(result['cert_check']['init_config']['ca_certs'],
'/etc/ssl/certs/ca-certificates.crt')
self.assertEqual(result['cert_check']['init_config']['ciphers'],
'HIGH:-aNULL:-eNULL:-PSK:RC4-SHA:RC4-MD5')
self.assertEqual(result['cert_check']['init_config']['collect_period'],
3600)
self.assertEqual(result['cert_check']['init_config']['timeout'],
1.0)
def test_build_config_with_args(self):
self.cert_obj.args.update({'ca_certs': '/tmp/ssl/certs/ca-certificates.crt',
'ciphers': 'fake-cipher',
'timeout': 3.0,
'collect_period': 1200})
result = self._build_config()
self.assertEqual(result['cert_check']['init_config']['ca_certs'],
'/tmp/ssl/certs/ca-certificates.crt')
self.assertEqual(result['cert_check']['init_config']['ciphers'],
'fake-cipher')
self.assertEqual(result['cert_check']['init_config']['collect_period'],
1200)
self.assertEqual(result['cert_check']['init_config']['timeout'],
3.0)
def test_timeout_error_log(self):
self.cert_obj.args.update({'ca_certs': '/tmp/ssl/certs/ca-certificates.crt',
'ciphers': 'fake-cipher',
'timeout': 0.0,
'collect_period': 1200})
with patch.object(LOG, 'error') as mock_log:
result = self._build_config()
self.assertEqual(result['cert_check']['init_config']['ca_certs'],
'/tmp/ssl/certs/ca-certificates.crt')
self.assertEqual(result['cert_check']['init_config']['ciphers'],
'fake-cipher')
self.assertEqual(result['cert_check']['init_config']['collect_period'],
1200)
self.assertEqual(result['cert_check']['init_config']['timeout'],
1.0)
self.assertTrue(mock_log.called)