Ceilometer client instantiation fixup

A problem was found during manual integration tests which were failing
because we couldn't instantiate the ceilometer client when trying to
execute an action plan using the 'basic_consolidation' strategy.

This patchset fixes the problem with an update of the related tests

Change-Id: I2b1f1dcc16fd8dfbf508c4d5661c1fce194254e4
Closes-Bug: #1544652

watcher/common/clients.py

@@ -141,8 +141,8 @@ class OpenStackClients(object):
 
         ceilometerclient_version = self._get_client_option('ceilometer',
                                                            'api_version')
-        self._ceilometer = ceclient.Client(ceilometerclient_version,
+        self._ceilometer = ceclient.get_client(ceilometerclient_version,
-                                           session=self.session)
+                                               session=self.session)
         return self._ceilometer
 
     @exception.wrap_keystone_exception

watcher/tests/common/test_clients.py

@@ -187,6 +187,7 @@ class TestClients(base.BaseTestCase):
         osc.ceilometer()
         mock_call.assert_called_once_with(
             cfg.CONF.ceilometer_client.api_version,
+            None,
             session=mock_session)
 
     @mock.patch.object(clients.OpenStackClients, 'session')
@@ -194,6 +195,7 @@ class TestClients(base.BaseTestCase):
     def test_clients_ceilometer_diff_vers(self, mock_get_alarm_client,
                                           mock_session):
         '''ceilometerclient currently only has one version (v2)'''
+        mock_get_alarm_client.return_value = [mock.Mock(), mock.Mock()]
         cfg.CONF.set_override('api_version', '2',
                               group='ceilometer_client')
         osc = clients.OpenStackClients()
@@ -206,6 +208,7 @@ class TestClients(base.BaseTestCase):
     @mock.patch.object(ceclient_v2.Client, '_get_alarm_client')
     def test_clients_ceilometer_cached(self, mock_get_alarm_client,
                                        mock_session):
+        mock_get_alarm_client.return_value = [mock.Mock(), mock.Mock()]
         osc = clients.OpenStackClients()
         osc._ceilometer = None
         ceilometer = osc.ceilometer()