From 060f06eb4c71b6a0cbd3094f6ae87308a7ef9abb Mon Sep 17 00:00:00 2001 From: Steve Jones Date: Fri, 22 Mar 2019 14:06:37 -0700 Subject: [PATCH] Change jobs to roles for dashboard --- AppDashboard/lib/app_dashboard_helper.py | 2 +- AppDashboard/test/functional/test_dashboard.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/AppDashboard/lib/app_dashboard_helper.py b/AppDashboard/lib/app_dashboard_helper.py index 2e27c0a8be..5b250db6b6 100644 --- a/AppDashboard/lib/app_dashboard_helper.py +++ b/AppDashboard/lib/app_dashboard_helper.py @@ -349,7 +349,7 @@ def get_host_with_role(self, role): logging.exception(err) return '' for node in nodes: - if role in node['jobs']: + if role in node['roles']: return node['public_ip'] return '' diff --git a/AppDashboard/test/functional/test_dashboard.py b/AppDashboard/test/functional/test_dashboard.py index 895adc9eb7..3607a34ae1 100644 --- a/AppDashboard/test/functional/test_dashboard.py +++ b/AppDashboard/test/functional/test_dashboard.py @@ -140,7 +140,7 @@ def setUp(self): } ]) acc.should_receive('get_role_info').and_return( - [{'jobs': ['shadow', 'login'], 'public_ip':'1.1.1.1'} ] + [{'roles': ['shadow', 'login'], 'public_ip':'1.1.1.1'} ] ) acc.should_receive('get_database_information').and_return( {'table':'fake_database', 'replication':1}