|
|
@@ -24,10 +24,11 @@ import time
|
|
|
from django.utils.translation import ugettext as _
|
|
|
|
|
|
from desktop.lib.exceptions_renderable import PopupException
|
|
|
-from libsentry.client import SentryClient
|
|
|
+from libzookeeper.models import ZookeeperClient
|
|
|
+
|
|
|
+from libsentry.client2 import SentryClient
|
|
|
from libsentry.conf import HOSTNAME, PORT
|
|
|
from libsentry.sentry_site import get_sentry_server_ha_enabled, get_sentry_server_ha_zookeeper_quorum, get_sentry_server_ha_zookeeper_namespace
|
|
|
-from libzookeeper.models import ZookeeperClient
|
|
|
|
|
|
|
|
|
LOG = logging.getLogger(__name__)
|
|
|
@@ -136,7 +137,7 @@ class SentryApi(object):
|
|
|
for role in response.roles:
|
|
|
roles.append({
|
|
|
'name': role.roleName,
|
|
|
- 'groups': [group.groupName for group in role.groups]
|
|
|
+ 'groups': list(role.groups)
|
|
|
})
|
|
|
return roles
|
|
|
else:
|