Merge "Enable Bionic as a gate test"

.gitignore

@@ -7,6 +7,7 @@ func-results.json
 test-charm/
 .project
 .pydevproject
+*.pyc
 **/__pycache__
 interfaces
 layers

src/tests/basic_deployment.py

@@ -62,7 +62,6 @@ class GnocchiCharmDeployment(amulet_deployment.OpenStackAmuletDeployment):
         this_service = {'name': 'gnocchi'}
         other_services = [
             {'name': 'percona-cluster'},
-            {'name': 'mongodb'},
             {'name': 'ceilometer'},
             {'name': 'keystone'},
             {'name': 'rabbitmq-server'},
@@ -70,6 +69,10 @@ class GnocchiCharmDeployment(amulet_deployment.OpenStackAmuletDeployment):
             {'name': 'ceph-mon', 'units': 3},
             {'name': 'ceph-osd', 'units': 3},
         ]
+
+        if self._get_openstack_release() < self.xenial_queens:
+            other_services.append({'name': 'mongodb'})
+
         super(GnocchiCharmDeployment, self)._add_services(
             this_service,
             other_services,
@@ -85,7 +88,6 @@ class GnocchiCharmDeployment(amulet_deployment.OpenStackAmuletDeployment):
             'gnocchi:storage-ceph': 'ceph-mon:client',
             'gnocchi:metric-service': 'ceilometer:metric-service',
             'gnocchi:coordinator-memcached': 'memcached:cache',
-            'ceilometer:shared-db': 'mongodb:database',
             'ceilometer:amqp': 'rabbitmq-server:amqp',
             'ceph-mon:osd': 'ceph-osd:mon',
         }
@@ -95,6 +97,7 @@ class GnocchiCharmDeployment(amulet_deployment.OpenStackAmuletDeployment):
         else:
             relations['ceilometer:identity-service'] = \
                 'keystone:identity-service'
+            relations['ceilometer:shared-db'] = 'mongodb:database'
         super(GnocchiCharmDeployment, self)._add_relations(relations)
 
     def _configure_services(self):

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-queens --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!)

unit_tests/__init__.py

@@ -24,6 +24,10 @@ charms_openstack.test_mocks.mock_charmhelpers()
 
 def mock_more_stuff():
     charmhelpers = charms_openstack.test_mocks.charmhelpers
+    sys.modules['charmhelpers.core.hookenv.charm_dir'] = (
+        charmhelpers.core.hookenv.charm_dir
+    )
+    charmhelpers.core.hookenv.charm_dir.return_value = "/tmp"
     sys.modules['charmhelpers.contrib.storage'] = (
         charmhelpers.contrib.storage
     )

unit_tests/test_gnocchi_handlers.py

@@ -114,9 +114,10 @@ class TestHandlers(test_utils.PatchHelper):
             'mygnocchi',
         )
 
+    @mock.patch.object(handlers, 'os')
     @mock.patch.object(handlers, 'hookenv')
     @mock.patch.object(handlers, 'ceph_helper')
-    def test_configure_ceph(self, mock_ceph_helper, mock_hookenv):
+    def test_configure_ceph(self, mock_ceph_helper, mock_hookenv, mock_os):
         mock_ceph = mock.MagicMock()
         mock_ceph.key.return_value = 'testkey'
         mock_hookenv.service_name.return_value = 'gnocchi'