openstack/barbican
Code Issues Proposed changes

Merge "Assigning oslo config CONF once to parsed barbican CONF instance"

Browse Source
This commit is contained in:
Jenkins 2015-12-04 18:39:41 +00:00 committed by Gerrit Code Review
commit 5d2a1ca97c
2 changed files with 41 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
barbican/common/config.py
View File

@ -150,8 +150,12 @@ quota_opts = [
help='Number of CAs allowed per project')
]
# Flag to indicate barbican configuration is already parsed once or not
_CONFIG_PARSED_ONCE = False
def parse_args(conf, args=None, usage=None, default_config_files=None):
global _CONFIG_PARSED_ONCE
conf(args=args if args else [],
project='barbican',
prog='barbican',
@ -162,6 +166,12 @@ def parse_args(conf, args=None, usage=None, default_config_files=None):
conf.pydev_debug_host = os.environ.get('PYDEV_DEBUG_HOST')
conf.pydev_debug_port = os.environ.get('PYDEV_DEBUG_PORT')
# Assign cfg.CONF handle to parsed barbican configuration once at startup
# only. No need to keep re-assigning it with separate plugin conf usage
if not _CONFIG_PARSED_ONCE:
cfg.CONF = conf
_CONFIG_PARSED_ONCE = True
def new_config():
conf = cfg.ConfigOpts()

31
barbican/tests/common/test_utils.py
View File

@ -13,8 +13,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import mock
from oslo_config import cfg
import six
from barbican.common import config
from barbican.common import utils
from barbican.tests import utils as test_utils
@ -128,3 +130,32 @@ class WhenTestingGenerateFullClassnameForInstance(test_utils.BaseTestCase):
self.instance.__class__.__module__ = 'dummy'
name = utils.generate_fullname_for(self.instance)
self.assertEqual('dummy.DummyClassForTesting', name)
class TestConfigValues(test_utils.BaseTestCase):
def setUp(self):
super(TestConfigValues, self).setUp()
self.barbican_config = config.CONF
self.oslo_config = cfg.CONF
def test_barbican_conf_values_made_visible_to_oslo_conf(self):
"""In this, checking oslo CONF values are same as barbican config
This tests shows that after the change values referenced via
oslo_config.cfg.CONF value are same as
barbican.common.config.CONF.
"""
# Checking that 'admin_role' value referred via
# barbican.common.config.CONF is same as oslo_config.cfg.CONF
self.assertEqual('admin', self.barbican_config._get('admin_role'))
self.assertEqual('admin', self.barbican_config.admin_role)
self.assertEqual('admin', self.oslo_config._get('admin_role'))
self.assertEqual('admin', self.oslo_config.admin_role)
# No error in getting 'project' value from both config reading
# mechanism
self.assertEqual('barbican', self.barbican_config.project)
self.assertEqual('barbican', self.oslo_config.project)