Move get_backdoor_port to base rpc API.

Each service implemented the get_backdoor_port method individually.  This
patch moves the implementation of this method to the base rpc API
instead, and removes the now unnecessary code from each of the services.
The server side method was left on all of the managers for rpc backwards
copmatibility.  They can be removed on the next major rpc version bump
of those APIs.

Part of blueprint base-rpc-api.

Change-Id: Ia8838fafd80eb86a1c2d66f5e97370042d8d8c53

16 files changed, 7 insertions, 136 deletions

diff --git a/nova/tests/cert/test_rpcapi.py b/nova/tests/cert/test_rpcapi.py
index b743ca1e5..bacbfc194 100644
--- a/nova/tests/cert/test_rpcapi.py
+++ b/nova/tests/cert/test_rpcapi.py
@@ -37,9 +37,6 @@ class CertRpcAPITestCase(test.TestCase):
         expected_msg = rpcapi.make_msg(method, **kwargs)
         expected_msg['version'] = expected_version
 
-        if method == 'get_backdoor_port':
-            del expected_msg['args']['host']
-
         self.call_ctxt = None
         self.call_topic = None
         self.call_msg = None
@@ -88,7 +85,3 @@ class CertRpcAPITestCase(test.TestCase):
     def test_decrypt_text(self):
         self._test_cert_api('decrypt_text',
                             project_id='fake_project_id', text='blah')
-
-    def test_get_backdoor_port(self):
-        self._test_cert_api('get_backdoor_port', host='fake_host',
-                            version='1.1')
diff --git a/nova/tests/compute/test_compute.py b/nova/tests/compute/test_compute.py
index dbd72a797..c9de65ed7 100644
--- a/nova/tests/compute/test_compute.py
+++ b/nova/tests/compute/test_compute.py
@@ -6822,24 +6822,6 @@ class ComputeAPITestCase(BaseTestCase):
 
         db.instance_destroy(self.context, instance['uuid'])
 
-    def test_get_backdoor_port(self):
-        # Test api call to get backdoor_port.
-        fake_backdoor_port = 59697
-
-        self.mox.StubOutWithMock(rpc, 'call')
-
-        rpc_msg = {'method': 'get_backdoor_port',
-                   'namespace': None,
-                   'args': {},
-                   'version': compute_rpcapi.ComputeAPI.BASE_RPC_API_VERSION}
-        rpc.call(self.context, 'compute.fake_host', rpc_msg,
-                 None).AndReturn(fake_backdoor_port)
-
-        self.mox.ReplayAll()
-
-        port = self.compute_api.get_backdoor_port(self.context, 'fake_host')
-        self.assertEqual(port, fake_backdoor_port)
-
     def test_console_output(self):
         fake_instance = {'uuid': 'fake_uuid',
                          'host': 'fake_compute_host'}
@@ -7529,19 +7511,6 @@ class ComputeAPIAggrTestCase(BaseTestCase):
                           self.context, aggr['id'], 'invalid_host')
 
 
-class ComputeBackdoorPortTestCase(BaseTestCase):
-    """This is for unit test coverage of backdoor port rpc."""
-
-    def setUp(self):
-        super(ComputeBackdoorPortTestCase, self).setUp()
-        self.context = context.get_admin_context()
-        self.compute.backdoor_port = 59697
-
-    def test_get_backdoor_port(self):
-        port = self.compute.get_backdoor_port(self.context)
-        self.assertEqual(port, self.compute.backdoor_port)
-
-
 class ComputeAggrTestCase(BaseTestCase):
     """This is for unit coverage of aggregate-related methods
     defined in nova.compute.manager."""
diff --git a/nova/tests/compute/test_compute_cells.py b/nova/tests/compute/test_compute_cells.py
index 952a557fb..40ae4e3de 100644
--- a/nova/tests/compute/test_compute_cells.py
+++ b/nova/tests/compute/test_compute_cells.py
@@ -148,9 +148,6 @@ class CellsComputeAPITestCase(test_compute.ComputeAPITestCase):
     def test_live_migrate(self):
         self.skipTest("Test is incompatible with cells.")
 
-    def test_get_backdoor_port(self):
-        self.skipTest("Test is incompatible with cells.")
-
     def test_snapshot_given_image_uuid(self):
         self.skipTest("Test doesn't apply to API cell.")
 
diff --git a/nova/tests/compute/test_rpcapi.py b/nova/tests/compute/test_rpcapi.py
index 2edf2e20f..2c04f8060 100644
--- a/nova/tests/compute/test_rpcapi.py
+++ b/nova/tests/compute/test_rpcapi.py
@@ -189,9 +189,6 @@ class ComputeRpcAPITestCase(test.TestCase):
         self._test_compute_api('host_power_action', 'call', action='action',
                 host='host')
 
-    def test_get_backdoor_port(self):
-        self._test_compute_api('get_backdoor_port', 'call', host='host')
-
     def test_inject_file(self):
         self._test_compute_api('inject_file', 'cast',
                 instance=self.fake_instance, path='path', file_contents='fc')
diff --git a/nova/tests/conductor/test_conductor.py b/nova/tests/conductor/test_conductor.py
index 73bdf5d71..9731a76d7 100644
--- a/nova/tests/conductor/test_conductor.py
+++ b/nova/tests/conductor/test_conductor.py
@@ -266,30 +266,6 @@ class _BaseTestCase(object):
         result = self.conductor.bw_usage_update(*update_args)
         self.assertEqual(result, 'foo')
 
-    def test_get_backdoor_port(self):
-        backdoor_port = 59697
-
-        def fake_get_backdoor_port(self, context):
-            return backdoor_port
-
-        if isinstance(self.conductor, conductor_api.API):
-            self.stubs.Set(conductor_manager.ConductorManager,
-                          'get_backdoor_port', fake_get_backdoor_port)
-            port = self.conductor.get_backdoor_port(self.context, 'fake_host')
-        elif isinstance(self.conductor, conductor_api.LocalAPI):
-            try:
-                self.conductor.get_backdoor_port(self.context, 'fake_host')
-            except exc.InvalidRequest:
-                port = backdoor_port
-        else:
-            if isinstance(self.conductor, conductor_rpcapi.ConductorAPI):
-                self.stubs.Set(conductor_manager.ConductorManager,
-                              'get_backdoor_port', fake_get_backdoor_port)
-            self.conductor.backdoor_port = backdoor_port
-            port = self.conductor.get_backdoor_port(self.context)
-
-        self.assertEqual(port, backdoor_port)
-
     def test_security_group_get_by_instance(self):
         fake_instance = {'id': 'fake-instance'}
         self.mox.StubOutWithMock(db, 'security_group_get_by_instance')
diff --git a/nova/tests/console/test_console.py b/nova/tests/console/test_console.py
index 54bcb32ca..e4211f258 100644
--- a/nova/tests/console/test_console.py
+++ b/nova/tests/console/test_console.py
@@ -186,13 +186,3 @@ class ConsoleAPITestCase(test.TestCase):
         self.mox.ReplayAll()
 
         self.console_api.create_console(self.context, self.fake_uuid)
-
-    def test_get_backdoor_port(self):
-        self.mox.StubOutWithMock(console_rpcapi.ConsoleAPI,
-                                 'get_backdoor_port')
-
-        console_rpcapi.ConsoleAPI.get_backdoor_port(self.context, 'fake_host')
-
-        self.mox.ReplayAll()
-
-        self.console_api.get_backdoor_port(self.context, 'fake_host')
diff --git a/nova/tests/console/test_rpcapi.py b/nova/tests/console/test_rpcapi.py
index 298c59c4e..691e0ef8d 100644
--- a/nova/tests/console/test_rpcapi.py
+++ b/nova/tests/console/test_rpcapi.py
@@ -37,9 +37,6 @@ class ConsoleRpcAPITestCase(test.TestCase):
         expected_msg = rpcapi.make_msg(method, **kwargs)
         expected_msg['version'] = expected_version
 
-        if method == 'get_backdoor_port':
-            del expected_msg['args']['host']
-
         self.fake_args = None
         self.fake_kwargs = None
 
@@ -65,7 +62,3 @@ class ConsoleRpcAPITestCase(test.TestCase):
     def test_remove_console(self):
         self._test_console_api('remove_console', console_id='i',
                                rpc_method='cast')
-
-    def test_get_backdoor_port(self):
-        self._test_console_api('get_backdoor_port', host='fake_host',
-                               rpc_method='call', version='1.1')
diff --git a/nova/tests/consoleauth/test_consoleauth.py b/nova/tests/consoleauth/test_consoleauth.py
index 41bec05e1..459da2fd8 100644
--- a/nova/tests/consoleauth/test_consoleauth.py
+++ b/nova/tests/consoleauth/test_consoleauth.py
@@ -102,11 +102,6 @@ class ConsoleauthTestCase(test.TestCase):
                                         instance_uuid=None)
         self.assertFalse(self.manager.check_token(self.context, "token"))
 
-    def test_get_backdoor_port(self):
-        self.manager.backdoor_port = 59697
-        port = self.manager.get_backdoor_port(self.context)
-        self.assertEqual(port, self.manager.backdoor_port)
-
 
 class CellsConsoleauthTestCase(ConsoleauthTestCase):
     """Test Case for consoleauth w/ cells enabled."""
diff --git a/nova/tests/consoleauth/test_rpcapi.py b/nova/tests/consoleauth/test_rpcapi.py
index 308c0d812..605322e75 100644
--- a/nova/tests/consoleauth/test_rpcapi.py
+++ b/nova/tests/consoleauth/test_rpcapi.py
@@ -38,9 +38,6 @@ class ConsoleAuthRpcAPITestCase(test.TestCase):
         expected_msg = rpcapi.make_msg(method, **kwargs)
         expected_msg['version'] = expected_version
 
-        if method == 'get_backdoor_port':
-            del expected_msg['args']['host']
-
         self.call_ctxt = None
         self.call_topic = None
         self.call_msg = None
@@ -81,7 +78,3 @@ class ConsoleAuthRpcAPITestCase(test.TestCase):
                                    _do_cast=True,
                                    instance_uuid="instance",
                                    version='1.2')
-
-    def test_get_backdoor_port(self):
-        self._test_consoleauth_api('get_backdoor_port', host='fake_host',
-                                   version='1.1')
diff --git a/nova/tests/fake_policy.py b/nova/tests/fake_policy.py
index b87360d0e..3f2d423f4 100644
--- a/nova/tests/fake_policy.py
+++ b/nova/tests/fake_policy.py
@@ -228,7 +228,6 @@ policy_data = """
     "network:get_instance_uuids_by_ip_filter": "",
     "network:get_instance_id_by_floating_address": "",
     "network:setup_networks_on_host": "",
-    "network:get_backdoor_port": "",
 
     "network:get_floating_ip": "",
     "network:get_floating_ip_pools": "",
diff --git a/nova/tests/network/test_api.py b/nova/tests/network/test_api.py
index 7a53dc8d4..304229b20 100644
--- a/nova/tests/network/test_api.py
+++ b/nova/tests/network/test_api.py
@@ -255,15 +255,3 @@ class ApiTestCase(test.TestCase):
         instance = {'uuid': FAKE_UUID}
         result = self.network_api._is_multi_host(self.context, instance)
         self.assertEqual(is_multi_host, result)
-
-    def test_get_backdoor_port(self):
-        backdoor_port = 59697
-
-        def fake_get_backdoor_port(ctxt, host):
-            return backdoor_port
-
-        self.stubs.Set(self.network_api.network_rpcapi, 'get_backdoor_port',
-                       fake_get_backdoor_port)
-
-        port = self.network_api.get_backdoor_port(self.context, 'fake_host')
-        self.assertEqual(port, backdoor_port)
diff --git a/nova/tests/network/test_manager.py b/nova/tests/network/test_manager.py
index f0d8e58a9..fd70e1584 100644
--- a/nova/tests/network/test_manager.py
+++ b/nova/tests/network/test_manager.py
@@ -1870,19 +1870,6 @@ class RPCAllocateTestCase(test.TestCase):
         self.assertEqual(rval, address)
 
 
-class BackdoorPortTestCase(test.TestCase):
-    """Tests nova.network.manager.get_backdoor_port."""
-    def setUp(self):
-        super(BackdoorPortTestCase, self).setUp()
-        self.manager = network_manager.NetworkManager()
-        self.manager.backdoor_port = 59697
-        self.context = context.RequestContext('fake', 'fake')
-
-    def test_backdoor_port(self):
-        port = self.manager.get_backdoor_port(self.context)
-        self.assertEqual(port, self.manager.backdoor_port)
-
-
 class TestFloatingIPManager(floating_ips.FloatingIP,
         network_manager.NetworkManager):
     """Dummy manager that implements FloatingIP."""
diff --git a/nova/tests/network/test_rpcapi.py b/nova/tests/network/test_rpcapi.py
index 55d502915..fbe0e7a8b 100644
--- a/nova/tests/network/test_rpcapi.py
+++ b/nova/tests/network/test_rpcapi.py
@@ -50,7 +50,7 @@ class NetworkRpcAPITestCase(test.TestCase):
             '_rpc_allocate_fixed_ip', 'deallocate_fixed_ip', 'update_dns',
             '_associate_floating_ip', '_disassociate_floating_ip',
             'lease_fixed_ip', 'release_fixed_ip', 'migrate_instance_start',
-            'migrate_instance_finish', 'get_backdoor_port',
+            'migrate_instance_finish',
             'allocate_for_instance', 'deallocate_for_instance',
         ]
         if method in targeted_methods and 'host' in kwargs:
@@ -138,10 +138,6 @@ class NetworkRpcAPITestCase(test.TestCase):
         self._test_network_api('get_instance_id_by_floating_address',
                 rpc_method='call', address='w.x.y.z')
 
-    def test_get_backdoor_port(self):
-        self._test_network_api('get_backdoor_port', rpc_method='call',
-                               host='fake_host', version='1.4')
-
     def test_get_vifs_by_instance(self):
         self._test_network_api('get_vifs_by_instance',
                 rpc_method='call', instance_id='fake_id')
diff --git a/nova/tests/scheduler/test_rpcapi.py b/nova/tests/scheduler/test_rpcapi.py
index 62038c722..9a7615c86 100644
--- a/nova/tests/scheduler/test_rpcapi.py
+++ b/nova/tests/scheduler/test_rpcapi.py
@@ -37,9 +37,6 @@ class SchedulerRpcAPITestCase(test.TestCase):
         expected_msg = rpcapi.make_msg(method, **kwargs)
         expected_msg['version'] = expected_version
 
-        if method == 'get_backdoor_port':
-            del expected_msg['args']['host']
-
         self.fake_args = None
         self.fake_kwargs = None
 
@@ -88,10 +85,6 @@ class SchedulerRpcAPITestCase(test.TestCase):
                 host='fake_host', capabilities='fake_capabilities',
                 version='2.4')
 
-    def test_get_backdoor_port(self):
-        self._test_scheduler_api('get_backdoor_port', rpc_method='call',
-                                 host='fake_host', version='2.5')
-
     def test_select_hosts(self):
         self._test_scheduler_api('select_hosts', rpc_method='call',
                 request_spec='fake_request_spec',
diff --git a/nova/tests/test_baserpc.py b/nova/tests/test_baserpc.py
index 1e33fba67..d9013fb99 100644
--- a/nova/tests/test_baserpc.py
+++ b/nova/tests/test_baserpc.py
@@ -43,3 +43,8 @@ class BaseAPITestCase(test.TestCase):
     def test_ping(self):
         res = self.base_rpcapi.ping(self.context, 'foo')
         self.assertEqual(res, {'service': 'compute', 'arg': 'foo'})
+
+    def test_get_backdoor_port(self):
+        res = self.base_rpcapi.get_backdoor_port(self.context,
+                self.compute.host)
+        self.assertEqual(res, self.compute.backdoor_port)
diff --git a/nova/tests/test_service.py b/nova/tests/test_service.py
index efe84fbb1..2cbc82fda 100644
--- a/nova/tests/test_service.py
+++ b/nova/tests/test_service.py
@@ -159,7 +159,7 @@ class ServiceTestCase(test.TestCase):
         # pre_start_hook is called after service record is created,
         # but before RPC consumer is created
         self.manager_mock.pre_start_hook(rpc_connection=mox.IgnoreArg())
-        self.manager_mock.create_rpc_dispatcher()
+        self.manager_mock.create_rpc_dispatcher(None)
         # post_start_hook is called after RPC consumer is created.
         self.manager_mock.post_start_hook()