From 36f42695963c6350df067983e178c824073b5e82 Mon Sep 17 00:00:00 2001
From: Dmitrii Shcherbakov <dmitrii.shcherbakov@canonical.com>
Date: Sun, 16 Jul 2017 15:12:23 +0200
Subject: [PATCH] drop non-neutron tests

In order to avoid blocking testing of the neutron charm due to
non-neutron related failures, let's delete them from this charm's tests.

---

https://docs.openstack.org/releasenotes/nova/newton.html#deprecation-notes

"The /os-certificates API is deprecated, as well as the nova-cert
service which powers it."

e8f5341034c574aa07fb587e66c5c47a1d3620f8 blacklisted the package from
installation, however, the basic deployment test was not modified for
this charm which blocks CI for all changes.

Change-Id: Icf2ffd55d25e256ece35ef622d39112d27a25b61
---
 tests/basic_deployment.py | 67 ---------------------------------------
 1 file changed, 67 deletions(-)

diff --git a/tests/basic_deployment.py b/tests/basic_deployment.py
index 888700d3..59a3ad8c 100644
--- a/tests/basic_deployment.py
+++ b/tests/basic_deployment.py
@@ -17,8 +17,6 @@ from charmhelpers.contrib.openstack.amulet.utils import (
     # ERROR
 )
 
-from charmhelpers.contrib.openstack.utils import CompareOpenStackReleases
-
 # Use DEBUG to turn on debug logging
 u = OpenStackAmuletUtils(DEBUG)
 
@@ -246,21 +244,7 @@ class NeutronGatewayBasicDeployment(OpenStackAmuletDeployment):
             neutron_services.remove('neutron-lbaas-agent')
             neutron_services.append('neutron-lbaasv2-agent')
 
-        nova_cc_services = ['nova-api-ec2',
-                            'nova-api-os-compute',
-                            'nova-objectstore',
-                            'nova-cert',
-                            'nova-scheduler',
-                            'nova-conductor']
-
-        _os_release = self._get_openstack_release_string()
-        if CompareOpenStackReleases(_os_release) >= 'liberty':
-            nova_cc_services.remove('nova-api-ec2')
-            nova_cc_services.remove('nova-objectstore')
-
         commands = {
-            self.keystone_sentry: ['keystone'],
-            self.nova_cc_sentry: nova_cc_services,
             self.neutron_gateway_sentry: neutron_services
         }
 
@@ -283,8 +267,6 @@ class NeutronGatewayBasicDeployment(OpenStackAmuletDeployment):
         }
         expected = {
             'network': [endpoint_check],
-            'compute': [endpoint_check],
-            'identity': [endpoint_check]
         }
         actual = self.keystone.service_catalog.get_endpoints()
 
@@ -312,55 +294,6 @@ class NeutronGatewayBasicDeployment(OpenStackAmuletDeployment):
             amulet.raise_status(amulet.FAIL,
                                 msg='glance endpoint: {}'.format(ret))
 
-    def test_110_users(self):
-        """Verify expected users."""
-        u.log.debug('Checking keystone users...')
-        expected = [
-            {'name': 'admin',
-             'enabled': True,
-             'tenantId': u.not_null,
-             'id': u.not_null,
-             'email': 'juju@localhost'},
-            {'name': 'neutron',
-             'enabled': True,
-             'tenantId': u.not_null,
-             'id': u.not_null,
-             'email': 'juju@localhost'}
-        ]
-
-        if self._get_openstack_release() >= self.xenial_ocata:
-            # Ocata or later
-            expected.append({
-                'name': 'placement_nova',
-                'enabled': True,
-                'tenantId': u.not_null,
-                'id': u.not_null,
-                'email': 'juju@localhost'
-            })
-        elif self._get_openstack_release() >= self.trusty_kilo:
-            # Kilo or later
-            expected.append({
-                'name': 'nova',
-                'enabled': True,
-                'tenantId': u.not_null,
-                'id': u.not_null,
-                'email': 'juju@localhost'
-            })
-        else:
-            # Juno and earlier
-            expected.append({
-                'name': 's3_ec2_nova',
-                'enabled': True,
-                'tenantId': u.not_null,
-                'id': u.not_null,
-                'email': 'juju@localhost'
-            })
-
-        actual = self.keystone.users.list()
-        ret = u.validate_user_data(expected, actual)
-        if ret:
-            amulet.raise_status(amulet.FAIL, msg=ret)
-
     def test_202_neutron_gateway_rabbitmq_amqp_relation(self):
         """Verify the neutron-gateway to rabbitmq-server amqp relation data"""
         u.log.debug('Checking neutron-gateway:rmq amqp relation data...')