Merge lp:~james-page/charm-helpers/lp1537155 into lp:charm-helpers

[James Page]

Support number of cpu detection on Ubuntu 16.04

The version of psutil in 16.04 does not have NUM_CPUS.

Use the new cpu_count function if present, otherwise use NUM_CPUS.

[Liam Young (gnuoy)]

Approved

review: Approve

=== modified file 'charmhelpers/contrib/openstack/context.py'
--- charmhelpers/contrib/openstack/context.py	2016-01-06 22:04:12 +0000
+++ charmhelpers/contrib/openstack/context.py	2016-01-29 09:25:13 +0000
@@ -90,6 +90,12 @@
 from charmhelpers.contrib.openstack.utils import get_host_ip
 from charmhelpers.core.unitdata import kv
 
+try:
+    import psutil
+except ImportError:
+    apt_install('python-psutil', fatal=True)
+    import psutil
+
 CA_CERT_PATH = '/usr/local/share/ca-certificates/keystone_juju_ca_cert.crt'
 ADDRESS_TYPES = ['admin', 'internal', 'public']
 
@@ -1258,13 +1264,11 @@
 
     @property
     def num_cpus(self):
-        try:
-            from psutil import NUM_CPUS
-        except ImportError:
-            apt_install('python-psutil', fatal=True)
-            from psutil import NUM_CPUS
-
-        return NUM_CPUS
+        # NOTE: use cpu_count if present (16.04 support)
+        if hasattr(psutil, 'cpu_count'):
+            return psutil.cpu_count()
+        else:
+            return psutil.NUM_CPUS
 
     def __call__(self):
         multiplier = config('worker-multiplier') or 0
 
=== modified file 'test_requirements.txt'
--- test_requirements.txt	2015-12-11 17:02:13 +0000
+++ test_requirements.txt	2016-01-29 09:25:13 +0000
@@ -17,3 +17,4 @@
 netifaces==0.10    # trusty is 0.8, but using py3 compatible version for tests.
 Jinja2==2.6        # precise
 six==1.1           # precise
+psutil==1.2.1      # trusty
 
=== modified file 'tests/contrib/openstack/test_os_contexts.py'
--- tests/contrib/openstack/test_os_contexts.py	2016-01-06 22:04:12 +0000
+++ tests/contrib/openstack/test_os_contexts.py	2016-01-29 09:25:13 +0000
@@ -2367,6 +2367,24 @@
         self.assertEquals(context.NotificationDriverContext()(),
                           {'notifications': 'True'})
 
+    @patch.object(context, 'psutil')
+    def test_workerconfig_context_xenial(self, _psutil):
+        self.config.side_effect = fake_config({
+            'worker-multiplier': 1,
+        })
+        _psutil.cpu_count.return_value = 4
+        worker = context.WorkerConfigContext()
+        self.assertTrue(worker.num_cpus, 4)
+
+    @patch.object(context, 'psutil')
+    def test_workerconfig_context_trusty(self, _psutil):
+        self.config.side_effect = fake_config({
+            'worker-multiplier': 2,
+        })
+        _psutil.NUM_CPUS = 4
+        worker = context.WorkerConfigContext()
+        self.assertTrue(worker.num_cpus, 2)
+
     def test_workerconfig_context_noconfig(self):
         self.config.return_value = None
         with patch.object(context.WorkerConfigContext, 'num_cpus', 2):