Enable Bionic as a gate test

Change bionic test from dev to gate for 18.05.

Change-Id: If8cb2ae0517d2bd26d016f0655b87fd818bdc2ac

src/tests/basic_deployment.py

@@ -106,11 +106,10 @@ class ManilaGenericBasicDeployment(OpenStackAmuletDeployment):
         u.log.debug('openstack release str: {}'.format(
             self._get_openstack_release_string()))
 
-        # Authenticate admin with keystone endpoint
-        self.keystone = u.authenticate_keystone_admin(self.keystone_sentry,
-                                                      user='admin',
-                                                      password='openstack',
-                                                      tenant='admin')
+        # Authenticate admin with keystone
+        self.keystone_session, self.keystone = u.get_default_keystone_session(
+            self.keystone_sentry,
+            openstack_release=self._get_openstack_release())
 
     def test_205_manila_to_manila_generic(self):
         """Verify that the manila to manila-generic config is working"""
@@ -178,6 +177,7 @@ class ManilaGenericBasicDeployment(OpenStackAmuletDeployment):
         # a demo user, demo project, and then get a demo manila client and do
         # the secret.  ensure that the default domain is created.
 
+        keystone_ip = self.keystone_sentry.info['public-address']
         if self._keystone_version == '2':
             # find or create the 'demo' tenant (project)
             tenant = self._find_or_create(
@@ -209,6 +209,15 @@ class ManilaGenericBasicDeployment(OpenStackAmuletDeployment):
                 key=lambda r: r.name.lower() == admin_role.name.lower(),
                 create=lambda: self.keystone.roles.add_user_role(
                     demo_user, admin_role, tenant=tenant))
+
+            # Authenticate demo user with keystone
+            self.demo_user_session, _ = u.get_keystone_session(
+                keystone_ip,
+                'demo',
+                'pass',
+                api_version=2,
+                project_name='demo',
+            )
         else:
             # find or create the 'default' domain
             domain = self._find_or_create(
@@ -257,17 +266,23 @@ class ManilaGenericBasicDeployment(OpenStackAmuletDeployment):
                     role=admin_role,
                     user=demo_user,
                     project=demo_project)
-
-        self.keystone_demo = u.authenticate_keystone_user(
-            self.keystone, user='demo',
-            password='pass', tenant='demo')
+            self.demo_user_session, _ = u.get_keystone_session(
+                keystone_ip,
+                'demo',
+                'pass',
+                api_version=3,
+                project_name='demo',
+                user_domain_name='default',
+                project_domain_name='default',
+            )
 
         # Authenticate admin with manila endpoint
         manila_ep = self.keystone.service_catalog.url_for(
             service_type='share', interface='publicURL')
-        manila = manila_client.Client(session=self.keystone_demo.session,
+        manila = manila_client.Client(session=self.demo_user_session,
                                       endpoint=manila_ep)
         # now just try a list the shares
         # NOTE(AJK) the 'search_opts={}' is needed to work around Bug#1707303
         manila.shares.list(search_opts={})
         u.log.debug('OK')
+        u.log.debug('OK')

src/tests/gate-basic-bionic-queens

@@ -6,5 +6,5 @@
 from basic_deployment import ManilaGenericBasicDeployment
 
 if __name__ == '__main__':
-    deployment = ManilaGenericBasicDeployment(series='bionic', keystone_version='2')
+    deployment = ManilaGenericBasicDeployment(series='bionic', keystone_version='3')
     deployment.run_tests()

src/tests/gate-basic-xenial-queens

@@ -0,0 +1,10 @@
+#!/usr/bin/env python
+
+"""Amulet tests on a basic barbican deployment on xenial-queens for keystone v2.
+"""
+
+from basic_deployment import ManilaGenericBasicDeployment
+
+if __name__ == '__main__':
+    deployment = ManilaGenericBasicDeployment(series='xenial', keystone_version='2')
+    deployment.run_tests()

src/tox.ini

@@ -35,7 +35,7 @@ commands =
 # Run a specific test as an Amulet smoke test (expected to always pass)
 basepython = python2.7
 commands =
-    bundletester -vl DEBUG -r json -o func-results.json gate-basic-xenial-pike --no-destroy
+    bundletester -vl DEBUG -r json -o func-results.json gate-basic-bionic-queens --no-destroy
 
 [testenv:func27-dfs]
 # Run all deploy-from-source tests which are +x (may not always pass!)