Merge pull request #3032 from sjones4/issue-jobs-to-roles

Change jobs to roles for dashboard
AppScale · Mar 26, 2019 · 49deffa · 49deffa
2 parents 20d0870 + 060f06e
commit 49deffa
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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}