openstack/nova
Code Issues Proposed changes

trivial: Rename 'policy_check' -> 'policy'

Browse Source 
The executable is 'nova-policy' - not 'nova-policy-check'.

Change-Id: I3e875a3284935cbb9607f01c7139982da0e11945
Signed-off-by: Stephen Finucane <sfinucan@redhat.com>
This commit is contained in:
Stephen Finucane
2017-10-25 17:56:40 +01:00
parent d0ef6fd4b5
commit 494fe90cf4
4 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
nova/cmd/policy_check.py → nova/cmd/policy.py
View File

2
nova/hacking/checks.py
View File

@@ -604,7 +604,7 @@ def check_config_option_in_central_place(logical_line, filename):
conf_exceptions = [ conf_exceptions = [
# CLI opts are allowed to be outside of nova/conf directory # CLI opts are allowed to be outside of nova/conf directory
'nova/cmd/manage.py', 'nova/cmd/manage.py',
'nova/cmd/policy_check.py', 'nova/cmd/policy.py',
'nova/cmd/status.py', 'nova/cmd/status.py',
# config options should not be declared in tests, but there is # config options should not be declared in tests, but there is
# another checker for it (N320) # another checker for it (N320)

32
nova/tests/unit/cmd/test_policy_check.py → nova/tests/unit/cmd/test_policy.py
View File

@@ -21,7 +21,7 @@ import fixtures
import mock import mock
from six.moves import StringIO from six.moves import StringIO
from nova.cmd import policy_check from nova.cmd import policy
import nova.conf import nova.conf
from nova import context as nova_context from nova import context as nova_context
from nova import db from nova import db
@@ -42,11 +42,11 @@ class TestPolicyCheck(test.NoDBTestCase):
self.output = StringIO() self.output = StringIO()
self.useFixture(fixtures.MonkeyPatch('sys.stdout', self.output)) self.useFixture(fixtures.MonkeyPatch('sys.stdout', self.output))
self.policy = self.useFixture(policy_fixture.RealPolicyFixture()) self.policy = self.useFixture(policy_fixture.RealPolicyFixture())
self.cmd = policy_check.PolicyCommands() self.cmd = policy.PolicyCommands()
@mock.patch.object(policy_check.PolicyCommands, '_filter_rules') @mock.patch.object(policy.PolicyCommands, '_filter_rules')
@mock.patch.object(policy_check.PolicyCommands, '_get_target') @mock.patch.object(policy.PolicyCommands, '_get_target')
@mock.patch.object(policy_check.PolicyCommands, '_get_context') @mock.patch.object(policy.PolicyCommands, '_get_context')
def test_check(self, mock_get_context, mock_get_target, def test_check(self, mock_get_context, mock_get_target,
mock_filter_rules): mock_filter_rules):
fake_rules = ['fake:rule', 'faux:roule'] fake_rules = ['fake:rule', 'faux:roule']
@@ -62,7 +62,7 @@ class TestPolicyCheck(test.NoDBTestCase):
self.assertEqual('\n'.join(fake_rules) + '\n', self.output.getvalue()) self.assertEqual('\n'.join(fake_rules) + '\n', self.output.getvalue())
@mock.patch.object(nova_context, 'RequestContext') @mock.patch.object(nova_context, 'RequestContext')
@mock.patch.object(policy_check, 'CONF') @mock.patch.object(policy, 'CONF')
def test_get_context(self, mock_CONF, mock_RequestContext): def test_get_context(self, mock_CONF, mock_RequestContext):
context = self.cmd._get_context() context = self.cmd._get_context()
@@ -156,31 +156,31 @@ class TestPolicyCheck(test.NoDBTestCase):
r.check_str in rule_conditions] r.check_str in rule_conditions]
self._check_filter_rules(db_context, instance, expected_rules) self._check_filter_rules(db_context, instance, expected_rules)
@mock.patch.object(policy_check.config, 'parse_args') @mock.patch.object(policy.config, 'parse_args')
@mock.patch.object(policy_check, 'CONF') @mock.patch.object(policy, 'CONF')
def _check_main(self, mock_CONF, mock_parse_args, def _check_main(self, mock_CONF, mock_parse_args,
category_name='check', expected_return_value=0): category_name='check', expected_return_value=0):
mock_CONF.category.name = category_name mock_CONF.category.name = category_name
return_value = policy_check.main() return_value = policy.main()
self.assertEqual(expected_return_value, return_value) self.assertEqual(expected_return_value, return_value)
mock_CONF.register_cli_opts.assert_called_once_with( mock_CONF.register_cli_opts.assert_called_once_with(
policy_check.cli_opts) policy.cli_opts)
mock_CONF.register_cli_opt.assert_called_once_with( mock_CONF.register_cli_opt.assert_called_once_with(
policy_check.category_opt) policy.category_opt)
@mock.patch.object(policy_check.version, 'version_string_with_package', @mock.patch.object(policy.version, 'version_string_with_package',
return_value="x.x.x") return_value="x.x.x")
def test_main_version(self, mock_version_string): def test_main_version(self, mock_version_string):
self._check_main(category_name='version') self._check_main(category_name='version')
self.assertEqual("x.x.x\n", self.output.getvalue()) self.assertEqual("x.x.x\n", self.output.getvalue())
@mock.patch.object(policy_check.cmd_common, 'print_bash_completion') @mock.patch.object(policy.cmd_common, 'print_bash_completion')
def test_main_bash_completion(self, mock_print_bash): def test_main_bash_completion(self, mock_print_bash):
self._check_main(category_name='bash-completion') self._check_main(category_name='bash-completion')
mock_print_bash.assert_called_once_with(policy_check.CATEGORIES) mock_print_bash.assert_called_once_with(policy.CATEGORIES)
@mock.patch.object(policy_check.cmd_common, 'get_action_fn') @mock.patch.object(policy.cmd_common, 'get_action_fn')
def test_main(self, mock_get_action_fn): def test_main(self, mock_get_action_fn):
mock_fn = mock.Mock() mock_fn = mock.Mock()
mock_fn_args = [mock.sentinel.arg] mock_fn_args = [mock.sentinel.arg]
@@ -192,7 +192,7 @@ class TestPolicyCheck(test.NoDBTestCase):
mock_fn.assert_called_once_with(mock.sentinel.arg, mock_fn.assert_called_once_with(mock.sentinel.arg,
key=mock.sentinel.value) key=mock.sentinel.value)
@mock.patch.object(policy_check.cmd_common, 'get_action_fn') @mock.patch.object(policy.cmd_common, 'get_action_fn')
def test_main_error(self, mock_get_action_fn): def test_main_error(self, mock_get_action_fn):
mock_fn = mock.Mock(side_effect=Exception) mock_fn = mock.Mock(side_effect=Exception)
mock_get_action_fn.return_value = (mock_fn, [], {}) mock_get_action_fn.return_value = (mock_fn, [], {})

2
setup.cfg
View File

@@ -64,7 +64,7 @@ console_scripts =
nova-manage = nova.cmd.manage:main nova-manage = nova.cmd.manage:main
nova-network = nova.cmd.network:main nova-network = nova.cmd.network:main
nova-novncproxy = nova.cmd.novncproxy:main nova-novncproxy = nova.cmd.novncproxy:main
nova-policy = nova.cmd.policy_check:main nova-policy = nova.cmd.policy:main
nova-rootwrap = oslo_rootwrap.cmd:main nova-rootwrap = oslo_rootwrap.cmd:main
nova-rootwrap-daemon = oslo_rootwrap.cmd:daemon nova-rootwrap-daemon = oslo_rootwrap.cmd:daemon
nova-scheduler = nova.cmd.scheduler:main nova-scheduler = nova.cmd.scheduler:main