From 3b46be0ef6062470d38d9bcac3b46c3df6013052 Mon Sep 17 00:00:00 2001 From: "Donovan Francesco (drifterza)" Date: Thu, 10 Nov 2016 17:16:19 +0200 Subject: [PATCH] Using updated tempest method for monasca api. Change-Id: I4bca2ad287f0bf431add62d62022c399cd7a5663 --- .gitignore | 5 +- tests/ansible-role-requirements.yml | 4 ++ tests/inventory | 3 ++ ...test-vars.yml => os_monasca-overrides.yml} | 35 +++++++++++- tests/test-install-monasca.yml | 1 - tests/test-monasca-functional.yml | 53 ------------------- tests/test.yml | 4 +- 7 files changed, 45 insertions(+), 60 deletions(-) rename tests/{test-vars.yml => os_monasca-overrides.yml} (55%) delete mode 100755 tests/test-monasca-functional.yml diff --git a/.gitignore b/.gitignore index 21adf3c..e0952ec 100644 --- a/.gitignore +++ b/.gitignore @@ -61,9 +61,8 @@ ChangeLog releasenotes/build # Test temp files -tests/plugins -tests/playbooks -tests/test.retry +tests/common +tests/*.retry # Vagrant artifacts .vagrant diff --git a/tests/ansible-role-requirements.yml b/tests/ansible-role-requirements.yml index 6062630..6a5a6f7 100644 --- a/tests/ansible-role-requirements.yml +++ b/tests/ansible-role-requirements.yml @@ -50,6 +50,10 @@ src: https://github.com/openstack/openstack-ansible-openstack_hosts scm: git version: master +- name: os_tempest + src: https://git.openstack.org/openstack/openstack-ansible-os_tempest + scm: git + version: master - name: ansible-zookeeper src: https://github.com/Chillisystems/ansible-zookeeper scm: git diff --git a/tests/inventory b/tests/inventory index ea96dd5..78f1a29 100644 --- a/tests/inventory +++ b/tests/inventory @@ -16,6 +16,9 @@ infra1 [memcached_all] infra1 +[utility_all] +openstack1 + [service_all:children] rabbitmq_all galera_all diff --git a/tests/test-vars.yml b/tests/os_monasca-overrides.yml similarity index 55% rename from tests/test-vars.yml rename to tests/os_monasca-overrides.yml index a2d3a57..f77f384 100644 --- a/tests/test-vars.yml +++ b/tests/os_monasca-overrides.yml @@ -15,6 +15,8 @@ # # (c) 2016 Donovan Francesco # (c) 2016 Paul Stevens + +monasca_venv_tag: "testing" monasca_developer_mode: True monasca_galera_address: "{{ hostvars[groups['galera_all'][0]]['ansible_host'] }}" external_lb_vip_address: "{{ hostvars[groups['keystone_all'][0]]['ansible_host'] }}" @@ -39,6 +41,9 @@ monasca_persister_requirements_git_install_branch: master monasca_python_client_requirements_git_install_branch: master monasca_service_password: "secrete" monasca_readonly_password: "secrete" +monasca_role_names: + - monasca-user + - anotherrole monasca_service_user_domain_name: default monasca_service_project_domain_name: Default monasca_service_project_name: service @@ -47,7 +52,6 @@ monasca_service_user_name: monasca monasca_readonly_user_name: monasca-read-only monasca_bind_port: 8070 monasca_log_api_bind_port: 5607 -monasca_venv_tag: untagged monasca_bin: "/openstack/venvs/monasca-{{ monasca_venv_tag }}/bin" storm_nimbus_enabled: true storm_supervisor_enabled: true @@ -68,3 +72,32 @@ grafana_mysql_db: "{{ monasca_grafana_galera_database }}" grafana_mysql_user: "{{ monasca_grafana_galera_username }}" grafana_mysql_password: "{{ monasca_grafana_galera_password }}" grafana_keystone_url: "{{ keystone_service_internalurl }}" +tempest_run: yes +tempest_venv_tag: "{{ tempest_git_install_branch }}" +tempest_venv_bin: "/opt/tempest_{{ tempest_venv_tag }}/bin" +tempest_log_dir: "/var/log/" +tempest_plugins: + - name: monasca-api + repo: https://git.openstack.org/openstack/monasca-api + branch: master +tempest_test_whitelist: + - monasca_tempest_tests.tests.api.test_alarm_definitions.TestAlarmDefinitions.test_create_alarm_definition + - monasca_tempest_tests.tests.api.test_alarm_definitions.TestAlarmDefinitions.test_create_alarm_definition_with_alarm_actions_exceeds_max_length + - monasca_tempest_tests.tests.api.test_alarm_definitions.TestAlarmDefinitions.test_create_alarm_definition_with_description_exceeds_max_length + - monasca_tempest_tests.tests.api.test_alarm_definitions.TestAlarmDefinitions.test_create_alarm_definition_with_invalid_severity + - monasca_tempest_tests.tests.api.test_alarm_definitions.TestAlarmDefinitions.test_create_alarm_definition_with_multiple_notifications + - monasca_tempest_tests.tests.api.test_alarm_definitions.TestAlarmDefinitions.test_create_alarm_definition_with_name_exceeds_max_length + - monasca_tempest_tests.tests.api.test_alarm_definitions.TestAlarmDefinitions.test_create_alarm_definition_with_notification + - monasca_tempest_tests.tests.api.test_alarm_definitions.TestAlarmDefinitions.test_create_alarm_definition_with_ok_actions_exceeds_max_length + - monasca_tempest_tests.tests.api.test_alarm_definitions.TestAlarmDefinitions.test_create_alarm_definition_with_special_chars_in_expression + - monasca_tempest_tests.tests.api.test_alarm_definitions.TestAlarmDefinitions.test_create_alarm_definition_with_undeterm_actions_exceeds_max_length + - monasca_tempest_tests.tests.api.test_alarm_definitions.TestAlarmDefinitions.test_create_alarm_definition_with_url_in_expression + - monasca_tempest_tests.tests.api.test_alarm_definitions.TestAlarmDefinitions.test_create_and_delete_alarm_definition + - monasca_tempest_tests.tests.api.test_alarm_definitions.TestAlarmDefinitions.test_create_deterministic_alarm_definition + - monasca_tempest_tests.tests.api.test_alarm_definitions.TestAlarmDefinitions.test_create_deterministic_alarm_definition_compound_expr + - monasca_tempest_tests.tests.api.test_alarm_definitions.TestAlarmDefinitions.test_update_notification_in_alarm_definition + - monasca_tempest_tests.tests.api.test_versions.TestVersions.* +neutron_provider_networks: + network_types: "vxlan,flat" + network_mappings: "flat:eth12" + network_vxlan_ranges: "1:1000" diff --git a/tests/test-install-monasca.yml b/tests/test-install-monasca.yml index b901b32..e94fd83 100644 --- a/tests/test-install-monasca.yml +++ b/tests/test-install-monasca.yml @@ -85,4 +85,3 @@ - role: "os_monasca" vars_files: - common/test-vars.yml - - test-vars.yml diff --git a/tests/test-monasca-functional.yml b/tests/test-monasca-functional.yml deleted file mode 100755 index 396dceb..0000000 --- a/tests/test-monasca-functional.yml +++ /dev/null @@ -1,53 +0,0 @@ ---- -# Copyright 2016 Internet Solutions (Pty) Ltd -# -# 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. -# -# (c) 2016 Donovan Francesco -# (c) 2016 Paul Stevens -# Reference: https://github.com/openstack/monasca-api/blob/master/docs/monasca-api-spec.md - -- name: Playbook for functional testing monasca - hosts: monasca_all - user: root - gather_facts: false - vars: - monasca_api: "http://localhost:{{ monasca_bind_port }}" - tasks: - - name: Install openstackclient - pip: - name: "python-openstackclient" - - - name: Validate that auth is required - uri: - url: "{{ monasca_api }}" - status_code: 401 - - - name: Get auth token - shell: > - . /root/openrc && openstack token issue --format yaml | awk '/^id\:/ {print $2}' - register: get_keystone_token - - - name: set token - set_fact: - keystone_token: "{{ get_keystone_token.stdout }}" - - - name: Check the monasca-api - uri: - url: "{{ monasca_api }}" - HEADER_X-Auth-Token: "{{ keystone_token }}" - status_code: 200,300 - - vars_files: - - common/test-vars.yml - - test-vars.yml diff --git a/tests/test.yml b/tests/test.yml index 1a94aef..2ae0e97 100644 --- a/tests/test.yml +++ b/tests/test.yml @@ -28,5 +28,5 @@ # Install monasca - include: test-install-monasca.yml -# Test monasca -- include: test-monasca-functional.yml +# Install tempest +- include: common/test-install-tempest.yml