From 9d2b04700673029ef407ff2856b562f10e7a3665 Mon Sep 17 00:00:00 2001 From: Witold Bedyk Date: Tue, 5 Dec 2017 15:24:51 +0100 Subject: [PATCH] Allow parentheses '()' in dimensions Update tempest tests to allow parentheses in dimensions. Update documentation. Change-Id: Idceed9a6cf2deff2c60bc865dc6a8fb2d0640412 Story: 2001385 Task: 5960 --- monasca_tempest_tests/tests/api/constants.py | 3 ++- monasca_tempest_tests/tests/api/test_metrics.py | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/monasca_tempest_tests/tests/api/constants.py b/monasca_tempest_tests/tests/api/constants.py index ee41f2f..2ce3f45 100644 --- a/monasca_tempest_tests/tests/api/constants.py +++ b/monasca_tempest_tests/tests/api/constants.py @@ -21,7 +21,8 @@ ALARM_DEFINITION_CREATION_WAIT = 1 MAX_METRIC_NAME_LENGTH = 255 MAX_DIMENSION_KEY_LENGTH = 255 MAX_DIMENSION_VALUE_LENGTH = 255 -INVALID_CHARS = "<>={}(),\"\;&" +INVALID_DIMENSION_CHARS = "<>={},\"\;&" +INVALID_NAME_CHARS = INVALID_DIMENSION_CHARS + "()" MAX_ALARM_DEFINITION_NAME_LENGTH = 255 MAX_ALARM_DEFINITION_DESCRIPTION_LENGTH = 255 diff --git a/monasca_tempest_tests/tests/api/test_metrics.py b/monasca_tempest_tests/tests/api/test_metrics.py index d611e50..fd9f63b 100644 --- a/monasca_tempest_tests/tests/api/test_metrics.py +++ b/monasca_tempest_tests/tests/api/test_metrics.py @@ -318,7 +318,7 @@ class TestMetrics(base.BaseMonascaTest): @decorators.attr(type='gate') @decorators.attr(type=['negative']) def test_create_metric_with_invalid_chars_in_name(self): - for invalid_char in constants.INVALID_CHARS: + for invalid_char in constants.INVALID_NAME_CHARS: metric = helpers.create_metric(invalid_char) self.assertRaises(exceptions.UnprocessableEntity, self.monasca_client.create_metrics, @@ -327,12 +327,12 @@ class TestMetrics(base.BaseMonascaTest): @decorators.attr(type='gate') @decorators.attr(type=['negative']) def test_create_metric_with_invalid_chars_in_dimensions(self): - for invalid_char in constants.INVALID_CHARS: + for invalid_char in constants.INVALID_DIMENSION_CHARS: metric = helpers.create_metric('name-1', {'key-1': invalid_char}) self.assertRaises(exceptions.UnprocessableEntity, self.monasca_client.create_metrics, metric) - for invalid_char in constants.INVALID_CHARS: + for invalid_char in constants.INVALID_DIMENSION_CHARS: metric = helpers.create_metric('name-1', {invalid_char: 'value-1'}) self.assertRaises(exceptions.UnprocessableEntity, self.monasca_client.create_metrics,