openstack/charm-neutron-gateway
Code Issues Proposed changes

wait for unit status instead of sleeping before amulet tests

Browse Source
This commit is contained in:
Ryan Beisner 2016-01-16 05:16:00 +00:00
parent 563876ab4a
commit 31f96aff86
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
tests/019-basic-trusty-mitaka Normal file → Executable file
View File

9
tests/basic_deployment.py
View File

@ -1,6 +1,5 @@
import amulet import amulet
import os import os
import time
import yaml import yaml
from neutronclient.v2_0 import client as neutronclient from neutronclient.v2_0 import client as neutronclient
@ -32,6 +31,11 @@ class NeutronGatewayBasicDeployment(OpenStackAmuletDeployment):
self._add_relations() self._add_relations()
self._configure_services() self._configure_services()
self._deploy() self._deploy()
u.log.info('Waiting on extended status checks...')
exclude_services = ['mysql']
self._auto_wait_for_status(exclude_services=exclude_services)
self._initialize_tests() self._initialize_tests()
def _add_services(self): def _add_services(self):
@ -154,9 +158,6 @@ class NeutronGatewayBasicDeployment(OpenStackAmuletDeployment):
self.neutron_gateway_sentry = self.d.sentry.unit['neutron-gateway/0'] self.neutron_gateway_sentry = self.d.sentry.unit['neutron-gateway/0']
self.neutron_api_sentry = self.d.sentry.unit['neutron-api/0'] self.neutron_api_sentry = self.d.sentry.unit['neutron-api/0']
# Let things settle a bit before moving forward
time.sleep(30)
# Authenticate admin with keystone # Authenticate admin with keystone
self.keystone = u.authenticate_keystone_admin(self.keystone_sentry, self.keystone = u.authenticate_keystone_admin(self.keystone_sentry,
user='admin', user='admin',