From ee21886a8cdf7a89d9d1192a57f8bf24c26dc896 Mon Sep 17 00:00:00 2001
From: Liam Young <liam.young@canonical.com>
Date: Tue, 4 Feb 2020 13:33:28 +0000
Subject: [PATCH] Fix order in UPGRADE_SERVICES

---
 test.py                               | 13 -------------
 zaza/openstack/utilities/openstack.py | 15 ++++++++++-----
 2 files changed, 10 insertions(+), 18 deletions(-)
 delete mode 100755 test.py

diff --git a/test.py b/test.py
deleted file mode 100755
index 6c94b60..0000000
--- a/test.py
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env python3
-
-from zaza.openstack.utilities import (
-    cli as cli_utils,
-    openstack as openstack_utils,
-    openstack_upgrade as upgrade_utils,
-)
-
-
-applications = []
-for group in ['Core Identity', 'Storage', 'Control Plane', 'Compute']:
-    applications.extend(upgrade_utils.SERVICE_GROUPS[group])
-print(applications)
diff --git a/zaza/openstack/utilities/openstack.py b/zaza/openstack/utilities/openstack.py
index 8b578e6..6d114b8 100644
--- a/zaza/openstack/utilities/openstack.py
+++ b/zaza/openstack/utilities/openstack.py
@@ -108,18 +108,23 @@ CHARM_TYPES = {
         'origin_setting': 'openstack-origin'
     },
 }
+
+# Older tests use the order the services appear in the list to imply
+# they shoould be upgraded in. This approache has been superceded and
+# zaza.openstack.utilities.openstack_upgrade.get_upgrade_groups should be used
+# instead
 UPGRADE_SERVICES = [
     {'name': 'keystone', 'type': CHARM_TYPES['keystone']},
-    {'name': 'nova-cloud-controller', 'type': CHARM_TYPES['nova']},
-    {'name': 'nova-compute', 'type': CHARM_TYPES['nova']},
     {'name': 'neutron-api', 'type': CHARM_TYPES['neutron']},
-    {'name': 'neutron-gateway', 'type': CHARM_TYPES['neutron']},
+    {'name': 'nova-cloud-controller', 'type': CHARM_TYPES['nova']},
     {'name': 'glance', 'type': CHARM_TYPES['glance']},
     {'name': 'cinder', 'type': CHARM_TYPES['cinder']},
-    {'name': 'openstack-dashboard',
-     'type': CHARM_TYPES['openstack-dashboard']},
+    {'name': 'neutron-gateway', 'type': CHARM_TYPES['neutron']},
     {'name': 'ceilometer', 'type': CHARM_TYPES['ceilometer']},
     {'name': 'designate', 'type': CHARM_TYPES['designate']},
+    {'name': 'nova-compute', 'type': CHARM_TYPES['nova']},
+    {'name': 'openstack-dashboard',
+     'type': CHARM_TYPES['openstack-dashboard']},
 ]