openstack/charm-neutron-openvswitch
Code Issues Proposed changes

Enable bionic/stein and disco/stein functional tests

Browse Source 
Change-Id: Iefdd3139a7a0543fa400296ecc4a497de8d4782b
This commit is contained in:
Frode Nordahl
2019-04-08 13:52:14 +02:00
committed by David Ames
parent 77805f1f2d
commit b92de6b6b9
3 changed files with 59 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tests/basic_deployment.py
View File

@@ -133,6 +133,13 @@ class NeutronOVSBasicDeployment(OpenStackAmuletDeployment):
self.neutron_api_sentry = self.d.sentry['neutron-api'][0]
self.n_ovs_sentry = self.d.sentry['neutron-openvswitch'][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
def _wait_and_check(self, sleep=5, exclude_services=[]):
"""Extended wait and check helper
@@ -357,9 +364,9 @@ class NeutronOVSBasicDeployment(OpenStackAmuletDeployment):
sleep_time = 30
for s, conf_file in services.iteritems():
u.log.debug("Checking that service restarted: {}".format(s))
if not u.validate_service_config_changed(sentry, mtime, s,
conf_file,
sleep_time=sleep_time):
if not u.validate_service_config_changed(
sentry, mtime, s, conf_file, sleep_time=sleep_time,
pgrep_full=self.pgrep_full):
self.d.configure(juju_service, set_default)
self._wait_and_check()
msg = "service {} didn't restart after config change".format(s)