Enable bionic/stein and disco/stein functional tests

Change-Id: Icb249cb96621dd358413ff96f7aacb5ee63d6452
This commit is contained in:
Frode Nordahl 2019-04-08 13:52:12 +02:00 committed by David Ames
parent c6985dd40e
commit c491835877
3 changed files with 32 additions and 5 deletions

View File

@ -154,6 +154,13 @@ class NeutronGatewayBasicDeployment(OpenStackAmuletDeployment):
self.neutron_gateway_sentry = self.d.sentry['neutron-gateway'][0] self.neutron_gateway_sentry = self.d.sentry['neutron-gateway'][0]
self.neutron_api_sentry = self.d.sentry['neutron-api'][0] self.neutron_api_sentry = self.d.sentry['neutron-api'][0]
# pidof is failing to find neutron-server on stein
# use pgrep instead.
if self._get_openstack_release() >= self.bionic_stein:
self.pgrep_full = True
else:
self.pgrep_full = False
# Authenticate admin with keystone # Authenticate admin with keystone
self.keystone_session, self.keystone = u.get_default_keystone_session( self.keystone_session, self.keystone = u.get_default_keystone_session(
self.keystone_sentry, self.keystone_sentry,
@ -958,8 +965,8 @@ class NeutronGatewayBasicDeployment(OpenStackAmuletDeployment):
# sleep_time = 90 # sleep_time = 90
for s, conf_file in services.iteritems(): for s, conf_file in services.iteritems():
u.log.debug("Checking that service restarted: {}".format(s)) u.log.debug("Checking that service restarted: {}".format(s))
if not u.validate_service_config_changed(sentry, mtime, s, if not u.validate_service_config_changed(
conf_file): sentry, mtime, s, conf_file, pgrep_full=self.pgrep_full):
self.d.configure(juju_service, set_default) self.d.configure(juju_service, set_default)
msg = "service {} didn't restart after config change".format(s) msg = "service {} didn't restart after config change".format(s)
amulet.raise_status(amulet.FAIL, msg=msg) amulet.raise_status(amulet.FAIL, msg=msg)
@ -1020,9 +1027,9 @@ class NeutronGatewayBasicDeployment(OpenStackAmuletDeployment):
for s, conf_file in services.iteritems(): for s, conf_file in services.iteritems():
u.log.debug("Checking that service restarted: {}".format(s)) u.log.debug("Checking that service restarted: {}".format(s))
if not u.validate_service_config_changed(sentry, mtime, s, if not u.validate_service_config_changed(
conf_file, sentry, mtime, s, conf_file, sleep_time=sleep_time,
sleep_time=sleep_time): pgrep_full=self.pgrep_full):
self.d.configure(juju_service, set_default) self.d.configure(juju_service, set_default)
msg = "service {} didn't restart after config change".format(s) msg = "service {} didn't restart after config change".format(s)

9
tests/dev-basic-disco-stein Executable file
View File

@ -0,0 +1,9 @@
#!/usr/bin/env python
"""Amulet tests on a basic quantum-gateway deployment on disco-stein."""
from basic_deployment import NeutronGatewayBasicDeployment
if __name__ == '__main__':
deployment = NeutronGatewayBasicDeployment(series='disco')
deployment.run_tests()

11
tests/gate-basic-bionic-stein Executable file
View File

@ -0,0 +1,11 @@
#!/usr/bin/env python
"""Amulet tests on a basic quantum-gateway deployment on bionic-stein."""
from basic_deployment import NeutronGatewayBasicDeployment
if __name__ == '__main__':
deployment = NeutronGatewayBasicDeployment(series='bionic',
openstack='cloud:bionic-stein',
source='cloud:bionic-stein')
deployment.run_tests()