865e182970
The configuration show should not require auth to just display the OSC config object. Changes to make it not require auth have knock-on effects of needing to change a bunch of tests that use it assuming it _does_ require auth so change those to use 'extension list' instead. This sets up further testing of the command line options for changes in behaviour when we switch to straight SDK usage for configuration. Change-Id: I6c52485341214ba401064c0f2d1e2b95fdc225c0 Signed-off-by: Dean Troyer <dtroyer@gmail.com>
95 lines
2.8 KiB
Python
95 lines
2.8 KiB
Python
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
import json
|
|
import os
|
|
|
|
from openstackclient.common import configuration
|
|
from openstackclient.tests.functional import base
|
|
|
|
|
|
BASIC_CONFIG_HEADERS = ['Field', 'Value']
|
|
|
|
|
|
class ConfigurationTests(base.TestCase):
|
|
"""Functional test for configuration."""
|
|
|
|
def test_configuration_show(self):
|
|
|
|
# Test show without option
|
|
raw_output = self.openstack('configuration show')
|
|
items = self.parse_listing(raw_output)
|
|
self.assert_table_structure(items, BASIC_CONFIG_HEADERS)
|
|
|
|
cmd_output = json.loads(self.openstack(
|
|
'configuration show -f json'
|
|
))
|
|
self.assertEqual(
|
|
configuration.REDACTED,
|
|
cmd_output['auth.password']
|
|
)
|
|
self.assertIn(
|
|
'auth.password',
|
|
cmd_output.keys(),
|
|
)
|
|
|
|
# Test show --mask
|
|
cmd_output = json.loads(self.openstack(
|
|
'configuration show --mask -f json'
|
|
))
|
|
self.assertEqual(
|
|
configuration.REDACTED,
|
|
cmd_output['auth.password']
|
|
)
|
|
|
|
# Test show --unmask
|
|
cmd_output = json.loads(self.openstack(
|
|
'configuration show --unmask -f json'
|
|
))
|
|
# If we are using os-client-config, this will not be set. Rather than
|
|
# parse clouds.yaml to get the right value, just make sure
|
|
# we are not getting redacted.
|
|
passwd = os.environ.get('OS_PASSWORD')
|
|
if passwd:
|
|
self.assertEqual(
|
|
passwd,
|
|
cmd_output['auth.password']
|
|
)
|
|
else:
|
|
self.assertNotEqual(
|
|
configuration.REDACTED,
|
|
cmd_output['auth.password']
|
|
)
|
|
|
|
|
|
class ConfigurationTestsNoAuth(base.TestCase):
|
|
"""Functional test for configuration with no auth"""
|
|
|
|
def test_configuration_show(self):
|
|
|
|
# Test show without option
|
|
raw_output = self.openstack(
|
|
'configuration show',
|
|
cloud=None,
|
|
)
|
|
items = self.parse_listing(raw_output)
|
|
self.assert_table_structure(items, BASIC_CONFIG_HEADERS)
|
|
|
|
cmd_output = json.loads(self.openstack(
|
|
'configuration show -f json',
|
|
cloud=None,
|
|
))
|
|
self.assertNotIn(
|
|
'auth.password',
|
|
cmd_output,
|
|
)
|