openstack
/
keystone
Code Issues Proposed changes

Adds warning when no domain configs were uploaded 

The 'keystone-manage domain_config_upload --all' previously didn't tell
the admin that there wasn't any files to upload. This means it was
possible for them to have put their configs in the wrong directory and
not know it.

Change-Id: Ib9ace1cc9654d4a32c9110eb5452c895605caf95
Closes-bug: #1472059
This commit is contained in:
David Stanek 2015-08-18 16:56:27 +00:00
parent d45d82f6ed
commit 1c38db61ec
2 changed files with 52 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
keystone/cmd/cli.py
View File

@ -991,9 +991,21 @@ class DomainConfigUploadFiles(object):
return False
return True
success_cnt = 0
failure_cnt = 0
for filename, domain_name in self._domain_config_finder(conf_dir):
self._upload_config_to_database(filename, domain_name)
if self._upload_config_to_database(filename, domain_name):
success_cnt += 1
LOG.info(_LI('Successfully uploaded domain config %r'),
filename)
else:
failure_cnt += 1
if success_cnt == 0:
LOG.warning(_LW('No domain configs uploaded from %r'), conf_dir)
if failure_cnt:
return False
return True
def run(self):

42
keystone/tests/unit/test_cli.py
View File

@ -12,12 +12,13 @@
# License for the specific language governing permissions and limitations
# under the License.
import logging
import os
import uuid
import fixtures
import mock
from oslo_config import fixture as config_fixture
import oslo_config.fixture
from oslo_log import log
from oslotest import mockpatch
from six.moves import range
@ -65,7 +66,7 @@ class CliTestCase(unit.SQLDriverOverrides, unit.TestCase):
class CliNoConfigTestCase(unit.BaseTestCase):
def setUp(self):
self.config_fixture = self.useFixture(config_fixture.Config(CONF))
self.config_fixture = self.useFixture(oslo_config.fixture.Config(CONF))
self.config_fixture.register_cli_opt(cli.command_opt)
self.useFixture(mockpatch.Patch(
'oslo_config.cfg.find_config_files', return_value=[]))
@ -313,6 +314,8 @@ class CliDomainConfigAllTestCase(unit.SQLDriverOverrides, unit.TestCase):
domain_config_dir=unit.TESTCONF + '/domain_configs_multi_ldap')
self.domain_count = 3
self.setup_initial_domains()
self.logging = self.useFixture(
fixtures.FakeLogger(level=logging.INFO))
def config_files(self):
self.config_fixture.register_cli_opt(cli.command_opt)
@ -552,7 +555,7 @@ class CliDBSyncTestCase(unit.BaseTestCase):
def setUp(self):
super(CliDBSyncTestCase, self).setUp()
self.config_fixture = self.useFixture(config_fixture.Config(CONF))
self.config_fixture = self.useFixture(oslo_config.fixture.Config(CONF))
self.config_fixture.register_cli_opt(cli.command_opt)
upgrades.offline_sync_database_to_version = mock.Mock()
upgrades.expand_schema = mock.Mock()
@ -660,3 +663,36 @@ class TestMappingPopulate(unit.SQLDriverOverrides, unit.TestCase):
'entity_type': identity_mapping.EntityType.USER}
self.assertIsNotNone(
self.id_mapping_api.get_public_id(local_entity))
class CliDomainConfigUploadNothing(unit.BaseTestCase):
def setUp(self):
super(CliDomainConfigUploadNothing, self).setUp()
config_fixture = self.useFixture(oslo_config.fixture.Config(CONF))
config_fixture.register_cli_opt(cli.command_opt)
# NOTE(dstanek): since this is not testing any database
# functionality there is no need to go through the motions and
# setup a test database.
def fake_load_backends(self):
self.resource_manager = mock.Mock()
self.useFixture(mockpatch.PatchObject(
cli.DomainConfigUploadFiles, 'load_backends', fake_load_backends))
tempdir = self.useFixture(fixtures.TempDir())
config_fixture.config(group='identity', domain_config_dir=tempdir.path)
self.logging = self.useFixture(
fixtures.FakeLogger(level=logging.DEBUG))
def test_uploading_all_from_an_empty_directory(self):
CONF(args=['domain_config_upload', '--all'], project='keystone',
default_config_files=[])
cli.DomainConfigUpload.main()
expected_msg = ('No domain configs uploaded from %r' %
CONF.identity.domain_config_dir)
self.assertThat(self.logging.output,
matchers.Contains(expected_msg))