diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-10-15 12:55:05 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-10-15 12:55:05 +0000 |
| commit | 562b6688c1b84c235952b461a36aac48438600c9 (patch) | |
| tree | af940cd1bf77c75d6f6e1a7c075d9cc0e9bbff26 | |
| parent | c7544532c6049c932cb18f59f66b2cff44749e2f (diff) | |
| parent | c1295d1c0c23053ea62d942e856eee82b820a09e (diff) | |
| download | tuskar-ui-562b6688c1b84c235952b461a36aac48438600c9.tar.gz | |
Merge "Fix deployment check to only look at active nodes"
| -rw-r--r-- | tuskar_ui/infrastructure/overview/forms.py | 3 | ||||
| -rw-r--r-- | tuskar_ui/infrastructure/overview/tests.py | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/tuskar_ui/infrastructure/overview/forms.py b/tuskar_ui/infrastructure/overview/forms.py index d42e8d58..43bd341b 100644 --- a/tuskar_ui/infrastructure/overview/forms.py +++ b/tuskar_ui/infrastructure/overview/forms.py @@ -103,7 +103,8 @@ def validate_plan(request, plan): 'link_url': reverse_lazy('horizon:infrastructure:flavors:index'), 'link_label': _(u"Define flavors."), }) - available_nodes = len(api.node.Node.list(request, associated=False)) + available_nodes = len(api.node.Node.list(request, associated=False, + maintenance=False)) if available_nodes == 0: messages.append({ 'text': _(u"You have no nodes available."), diff --git a/tuskar_ui/infrastructure/overview/tests.py b/tuskar_ui/infrastructure/overview/tests.py index 2a0151bd..3797c47a 100644 --- a/tuskar_ui/infrastructure/overview/tests.py +++ b/tuskar_ui/infrastructure/overview/tests.py @@ -100,7 +100,7 @@ class OverviewTests(test.BaseAdminViewTests): call(request), ]) self.assertListEqual(api.node.Node.list.call_args_list, [ - call(request, associated=False), + call(request, associated=False, maintenance=False), ]) self.assertListEqual(api.flavor.Flavor.list.call_args_list, [ call(request), |