From c4918358777593c4dffa84d2af730591a1c908ce Mon Sep 17 00:00:00 2001
From: Frode Nordahl <frode.nordahl@canonical.com>
Date: Mon, 8 Apr 2019 13:52:12 +0200
Subject: [PATCH] Enable bionic/stein and disco/stein functional tests

Change-Id: Icb249cb96621dd358413ff96f7aacb5ee63d6452
---
 tests/basic_deployment.py     | 17 ++++++++++++-----
 tests/dev-basic-disco-stein   |  9 +++++++++
 tests/gate-basic-bionic-stein | 11 +++++++++++
 3 files changed, 32 insertions(+), 5 deletions(-)
 create mode 100755 tests/dev-basic-disco-stein
 create mode 100755 tests/gate-basic-bionic-stein

diff --git a/tests/basic_deployment.py b/tests/basic_deployment.py
index e9c3cbf9..c46987ad 100644
--- a/tests/basic_deployment.py
+++ b/tests/basic_deployment.py
@@ -154,6 +154,13 @@ class NeutronGatewayBasicDeployment(OpenStackAmuletDeployment):
         self.neutron_gateway_sentry = self.d.sentry['neutron-gateway'][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
         self.keystone_session, self.keystone = u.get_default_keystone_session(
             self.keystone_sentry,
@@ -958,8 +965,8 @@ class NeutronGatewayBasicDeployment(OpenStackAmuletDeployment):
         # sleep_time = 90
         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):
+            if not u.validate_service_config_changed(
+                    sentry, mtime, s, conf_file, pgrep_full=self.pgrep_full):
                 self.d.configure(juju_service, set_default)
                 msg = "service {} didn't restart after config change".format(s)
                 amulet.raise_status(amulet.FAIL, msg=msg)
@@ -1020,9 +1027,9 @@ class NeutronGatewayBasicDeployment(OpenStackAmuletDeployment):
 
         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)
                 msg = "service {} didn't restart after config change".format(s)
diff --git a/tests/dev-basic-disco-stein b/tests/dev-basic-disco-stein
new file mode 100755
index 00000000..ccbb08bb
--- /dev/null
+++ b/tests/dev-basic-disco-stein
@@ -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()
diff --git a/tests/gate-basic-bionic-stein b/tests/gate-basic-bionic-stein
new file mode 100755
index 00000000..e7e38bab
--- /dev/null
+++ b/tests/gate-basic-bionic-stein
@@ -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()