summaryrefslogtreecommitdiffstats
path: root/nova/tests
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-02-17 00:16:26 +0000
committerGerrit Code Review <review@openstack.org>2012-02-17 00:16:26 +0000
commit844035b6c0f725c685cdff56a7bb77efe7825a5f (patch)
tree8fc52730c5dcaefc25b97f1868a71a0db2bd1462 /nova/tests
parent7162ee5077f73f35be1488c413ae485897fc68e7 (diff)
parent00c77e0e9af6ae16484e4bee5f33de1eeb812227 (diff)
Merge "bug 931604: improve how xenapi RRD records are retrieved"
Diffstat (limited to 'nova/tests')
-rw-r--r--nova/tests/test_xenapi.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/nova/tests/test_xenapi.py b/nova/tests/test_xenapi.py
index 2b1f99f7b..2673977f4 100644
--- a/nova/tests/test_xenapi.py
+++ b/nova/tests/test_xenapi.py
@@ -236,6 +236,12 @@ class XenAPIVMTestCase(test.TestCase):
instances = self.conn.list_instances()
self.assertEquals(instances, [])
+ def test_get_rrd_server(self):
+ self.flags(xenapi_connection_url='myscheme://myaddress/')
+ server_info = vm_utils.get_rrd_server()
+ self.assertEqual(server_info[0], 'myscheme')
+ self.assertEqual(server_info[1], 'myaddress')
+
def test_get_diagnostics(self):
instance = self._create_instance()
self.conn.get_diagnostics(instance)