From 2b100e15002fb07c9eeb1497ca11c4c42bab1ba3 Mon Sep 17 00:00:00 2001 From: Matthew Treinish Date: Mon, 10 Dec 2012 14:58:35 -0500 Subject: Add get_backdoor_port to nova-conductor. This adds a get_backdoor_port function to nova conductor which enables returning the eventlet_backdoor port from rpc for the service. Change-Id: Ifb08c685a6f52621e954ba84e3c5eadf83fe4704 --- nova/tests/conductor/test_conductor.py | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'nova/tests') diff --git a/nova/tests/conductor/test_conductor.py b/nova/tests/conductor/test_conductor.py index 8805ac648..cace21984 100644 --- a/nova/tests/conductor/test_conductor.py +++ b/nova/tests/conductor/test_conductor.py @@ -23,6 +23,7 @@ from nova.conductor import rpcapi as conductor_rpcapi from nova import context from nova import db from nova.db.sqlalchemy import models +from nova import exception as exc from nova import notifications from nova.openstack.common import jsonutils from nova.openstack.common import timeutils @@ -168,6 +169,30 @@ class ConductorTestCase(BaseTestCase): 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) + class ConductorRPCAPITestCase(ConductorTestCase): """Conductor RPC API Tests""" -- cgit