Use osapi_compute worker for api v2 service

osapi_compute is intended to be a superset of the compute APIs (v1
through v3 and beyond). So use the worker settings for osapi_compute
when launching any service that starts with 'openstack_compute_api' that
might be defined in paste.ini and in enabled_apis. While this could
result in the single setting causing nX workers, where n is each
openstack_compute_api_* thing defined, it is expected that only one is
enabled, or the full superset is enabled.

Change-Id: Ic1bb69c8675f2ffb71cdf8a4b38ba7b02e697458

1 files changed, 20 insertions, 0 deletions

diff --git a/nova/tests/unit/test_service.py b/nova/tests/unit/test_service.py
index 269fb30eb1..16cc4481b0 100644
--- a/nova/tests/unit/test_service.py
+++ b/nova/tests/unit/test_service.py
@@ -333,6 +333,26 @@ class TestWSGIService(test.TestCase):
         self.assertRaises(exception.InvalidInput,
                           service.WSGIService, "osapi_compute")
 
+    def test_openstack_compute_api_workers_set_default(self):
+        test_service = service.WSGIService("openstack_compute_api_v2")
+        self.assertEqual(test_service.workers, processutils.get_worker_count())
+
+    def test_openstack_compute_api_workers_set_good_user_setting(self):
+        CONF.set_override('osapi_compute_workers', 8)
+        test_service = service.WSGIService("openstack_compute_api_v2")
+        self.assertEqual(test_service.workers, 8)
+
+    def test_openstack_compute_api_workers_set_zero_user_setting(self):
+        CONF.set_override('osapi_compute_workers', 0)
+        test_service = service.WSGIService("openstack_compute_api_v2")
+        # If a value less than 1 is used, defaults to number of procs available
+        self.assertEqual(test_service.workers, processutils.get_worker_count())
+
+    def test_openstack_compute_api_service_start_with_illegal_workers(self):
+        CONF.set_override("osapi_compute_workers", -1)
+        self.assertRaises(exception.InvalidInput,
+                          service.WSGIService, "openstack_compute_api_v2")
+
     @testtools.skipIf(not utils.is_ipv6_supported(), "no ipv6 support")
     def test_service_random_port_with_ipv6(self):
         CONF.set_default("test_service_listen", "::1")