From 904aa0d6049938f65c8a48738dc9318bb194f994 Mon Sep 17 00:00:00 2001 From: Liam Young Date: Wed, 1 Nov 2017 16:13:37 +0000 Subject: [PATCH] Fix test_303 for pre-mitaka test_303_nova_ceilometer_config_check_endpoint was recently introduced but it expects ceilometer-polling aganet to be present which it is not on pre-liberty releases. This change fixes that assumption and updates the expected keyword for earlier releases. Change-Id: I1d6cb06433f70a2c0225cafb77f3a2cbbfe703b7 Closes-Bug: #1729346 --- tests/basic_deployment.py | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/tests/basic_deployment.py b/tests/basic_deployment.py index ac4881f..5fef59c 100644 --- a/tests/basic_deployment.py +++ b/tests/basic_deployment.py @@ -601,13 +601,22 @@ class CeiloAgentBasicDeployment(OpenStackAmuletDeployment): 'DEFAULT': { 'logdir': '/var/log/ceilometer' }, - 'service_credentials': { - 'interface': 'internalURL' - }, } juju_service = 'ceilometer-agent' - service = 'ceilometer-polling' + if self._get_openstack_release() >= self.xenial_ocata: + service = 'ceilometer-polling: AgentManager worker(0)' + elif self._get_openstack_release() >= self.xenial_newton: + service = 'ceilometer-polling - AgentManager(0)' + elif self._get_openstack_release() >= self.trusty_liberty: + service = 'ceilometer-polling' + else: + service = 'ceilometer-agent-compute' + if self._get_openstack_release() >= self.trusty_mitaka: + int_value = 'internalURL' + else: + int_value = 'internal' + expected_alternate['service_credentials'] = {'interface': int_value} option = 'use-internal-endpoints' set_default = {option: 'False'} set_alternate = {option: 'True'}