Remove restiction on allowable namespaces in polling.

Change-Id: Icc972d0880283d46ff97203c67816e1aa103d504
Closes-Bug: #1767939
This commit is contained in:
Sam Morrison 2018-04-30 16:15:12 +10:00
parent b83b8182af
commit 145a00988e
2 changed files with 0 additions and 17 deletions

View File

@ -62,7 +62,6 @@ class DeduplicatedCfgList(cfg.types.List):
CLI_OPTS = [
MultiChoicesOpt('polling-namespaces',
default=['compute', 'central'],
choices=['compute', 'central', 'ipmi'],
dest='polling_namespaces',
help='Polling namespace(s) to be used while '
'resource polling'),

View File

@ -110,19 +110,3 @@ class BinCeilometerPollingServiceTestCase(base.BaseTestCase):
break
else:
self.fail('Did not detect expected warning: %s' % expected)
def test_polling_namespaces_invalid_value_in_config(self):
content = ("[DEFAULT]\n"
"transport_url = fake://\n"
"polling_namespaces = ['central']\n")
if six.PY3:
content = content.encode('utf-8')
self.tempfile = fileutils.write_to_tempfile(content=content,
prefix='ceilometer',
suffix='.conf')
self.subp = subprocess.Popen(
["ceilometer-polling", "--config-file=%s" % self.tempfile],
stderr=subprocess.PIPE)
__, err = self.subp.communicate()
self.assertIn(b"Exception: Valid values are ['compute', 'central', "
b"'ipmi'], but found [\"['central']\"]", err)