From c5e835db336eb27257a623b32e2552aefe294283 Mon Sep 17 00:00:00 2001
From: David Ames <david.ames@canonical.com>
Date: Mon, 27 Aug 2018 15:44:24 +0000
Subject: [PATCH] Enable Rocky testing

Change dev-gate-bionic-rocky to a gate.

Change-Id: I138fc9cbea66138147e0fd0e30fc323d52514158
---
 .../contrib/openstack/amulet/utils.py         | 29 ++++++++++++++-----
 ...c-bionic-rocky => gate-basic-bionic-rocky} |  0
 2 files changed, 22 insertions(+), 7 deletions(-)
 rename tests/{dev-basic-bionic-rocky => gate-basic-bionic-rocky} (100%)

diff --git a/tests/charmhelpers/contrib/openstack/amulet/utils.py b/tests/charmhelpers/contrib/openstack/amulet/utils.py
index ef4ab54b..6637865d 100644
--- a/tests/charmhelpers/contrib/openstack/amulet/utils.py
+++ b/tests/charmhelpers/contrib/openstack/amulet/utils.py
@@ -24,7 +24,8 @@ import urlparse
 
 import cinderclient.v1.client as cinder_client
 import cinderclient.v2.client as cinder_clientv2
-import glanceclient.v1.client as glance_client
+import glanceclient.v1 as glance_client
+import glanceclient.v2 as glance_clientv2
 import heatclient.v1.client as heat_client
 from keystoneclient.v2_0 import client as keystone_client
 from keystoneauth1.identity import (
@@ -623,7 +624,7 @@ class OpenStackAmuletUtils(AmuletUtils):
         ep = keystone.service_catalog.url_for(service_type='image',
                                               interface='adminURL')
         if keystone.session:
-            return glance_client.Client(ep, session=keystone.session)
+            return glance_clientv2.Client("2", session=keystone.session)
         else:
             return glance_client.Client(ep, token=keystone.auth_token)
 
@@ -711,10 +712,19 @@ class OpenStackAmuletUtils(AmuletUtils):
         f.close()
 
         # Create glance image
-        with open(local_path) as f:
-            image = glance.images.create(name=image_name, is_public=True,
-                                         disk_format='qcow2',
-                                         container_format='bare', data=f)
+        if float(glance.version) < 2.0:
+            with open(local_path) as fimage:
+                image = glance.images.create(name=image_name, is_public=True,
+                                             disk_format='qcow2',
+                                             container_format='bare',
+                                             data=fimage)
+        else:
+            image = glance.images.create(
+                name=image_name,
+                disk_format="qcow2",
+                visibility="public",
+                container_format="bare")
+            glance.images.upload(image.id, open(local_path, 'rb'))
 
         # Wait for image to reach active status
         img_id = image.id
@@ -729,9 +739,14 @@ class OpenStackAmuletUtils(AmuletUtils):
         self.log.debug('Validating image attributes...')
         val_img_name = glance.images.get(img_id).name
         val_img_stat = glance.images.get(img_id).status
-        val_img_pub = glance.images.get(img_id).is_public
         val_img_cfmt = glance.images.get(img_id).container_format
         val_img_dfmt = glance.images.get(img_id).disk_format
+
+        if float(glance.version) < 2.0:
+            val_img_pub = glance.images.get(img_id).is_public
+        else:
+            val_img_pub = glance.images.get(img_id).visibility == "public"
+
         msg_attr = ('Image attributes - name:{} public:{} id:{} stat:{} '
                     'container fmt:{} disk fmt:{}'.format(
                         val_img_name, val_img_pub, img_id,
diff --git a/tests/dev-basic-bionic-rocky b/tests/gate-basic-bionic-rocky
similarity index 100%
rename from tests/dev-basic-bionic-rocky
rename to tests/gate-basic-bionic-rocky