From f8e295a8601fe8849cb7d5b13578acb249865c10 Mon Sep 17 00:00:00 2001 From: Tymoteusz Jankowski Date: Mon, 20 Apr 2015 12:07:39 +0200 Subject: [PATCH] Fixed getting name of default pool for vserv. Getting default pool's name only if pool is assigned. Added regression test. --- src/ralph/ui/tests/unit/test_others.py | 23 +++++++++++++++++++++++ src/ralph/ui/views/common.py | 2 +- 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 src/ralph/ui/tests/unit/test_others.py diff --git a/src/ralph/ui/tests/unit/test_others.py b/src/ralph/ui/tests/unit/test_others.py new file mode 100644 index 0000000000..57320aa320 --- /dev/null +++ b/src/ralph/ui/tests/unit/test_others.py @@ -0,0 +1,23 @@ +# -*- coding: utf-8 -*- + +from __future__ import absolute_import +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals + +from django.test import TestCase + +from ralph.discovery.tests.util import ( + DeviceFactory, + LoadBalancerVirtualServerFactory, +) +from ralph.ui.views.common import _get_balancers + + +class TestAddresses(TestCase): + + def test_got_balancers_when_no_default_pool(self): + lbvs = LoadBalancerVirtualServerFactory() + self.assertIsNone(lbvs.default_pool) + balancers = list(_get_balancers(lbvs.device)) + self.assertIsNone(balancers[0]['pool']) diff --git a/src/ralph/ui/views/common.py b/src/ralph/ui/views/common.py index aa62bf8300..0bb7fd30c6 100644 --- a/src/ralph/ui/views/common.py +++ b/src/ralph/ui/views/common.py @@ -147,7 +147,7 @@ def _get_balancers(dev): ).all(): yield { 'balancer': dev.name, - 'pool': vserv.default_pool.name, + 'pool': vserv.default_pool.name if vserv.default_pool else None, 'enabled': None, 'address': vserv.address.address, 'server': vserv.name,