diff --git a/lib/cli.py b/lib/cli.py index 212cd679ad9da852936b6ece03f23f6a8c7e0897..32ef069b6e037bd8338473aca7b89562a7c9aff1 100644 --- a/lib/cli.py +++ b/lib/cli.py @@ -3765,7 +3765,7 @@ def FormatPolicyInfo(custom_ipolicy, eff_ipolicy, iscluster): ) ret.append( - ("enabled disk templates", + ("allowed disk templates", _FormatListInfoDefault(custom_ipolicy.get(constants.IPOLICY_DTS), eff_ipolicy[constants.IPOLICY_DTS])) ) diff --git a/qa/qa_cluster.py b/qa/qa_cluster.py index e281178643bc484ec1ca773e58489bb2a49904fe..cde9db3a19e3ab65e3c1157673f2fd82bc7350c1 100644 --- a/qa/qa_cluster.py +++ b/qa/qa_cluster.py @@ -578,7 +578,7 @@ def TestClusterModifyIPolicy(): # Disk templates are treated slightly differently par = "disk-templates" - disp_str = "enabled disk templates" + disp_str = "allowed disk templates" curr_val = old_policy[disp_str] test_values = [ (True, constants.DT_PLAIN), diff --git a/qa/qa_group.py b/qa/qa_group.py index e71451a1f6f4d66983cda797a8b3c699699f428e..b8699e2a1e62ea6312d81991e27b63d757a19744 100644 --- a/qa/qa_group.py +++ b/qa/qa_group.py @@ -201,7 +201,7 @@ def _TestGroupModifyIPolicy(groupname): ("vcpu-ratio", 1.5, None, 1.5), ("spindle-ratio", 1.5, None, 1.5), ("disk-templates", constants.DT_PLAIN, - "enabled disk templates", constants.DT_PLAIN) + "allowed disk templates", constants.DT_PLAIN) ]: if not iname: iname = par diff --git a/test/py/ganeti.cli_unittest.py b/test/py/ganeti.cli_unittest.py index 855ff402e61a7357c712bfd504a1adc9d82a295f..0c221ee5f927333f564bdf8400ee99f86b5c8ff0 100755 --- a/test/py/ganeti.cli_unittest.py +++ b/test/py/ganeti.cli_unittest.py @@ -1220,7 +1220,7 @@ class TestFormatPolicyInfo(unittest.TestCase): def _TranslateParsedNames(self, parsed): for (pretty, raw) in [ ("bounds specs", constants.ISPECS_MINMAX), - ("enabled disk templates", constants.IPOLICY_DTS) + ("allowed disk templates", constants.IPOLICY_DTS) ]: self._RenameDictItem(parsed, pretty, raw) for minmax in parsed[constants.ISPECS_MINMAX]: