summaryrefslogtreecommitdiffstats
path: root/nova/tests
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-12-11 17:45:27 +0000
committerGerrit Code Review <review@openstack.org>2012-12-11 17:45:27 +0000
commit78bbc71bc3a10048e158be6757bf44f2a685458d (patch)
tree7228a0a7d1b15baa0b78456e076ad95e8aecaa7e /nova/tests
parentfa49ec0027e864bbe994818ddb0314e0412e3e58 (diff)
parent2b100e15002fb07c9eeb1497ca11c4c42bab1ba3 (diff)
Merge "Add get_backdoor_port to nova-conductor."
Diffstat (limited to 'nova/tests')
-rw-r--r--nova/tests/conductor/test_conductor.py25
1 files changed, 25 insertions, 0 deletions
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"""