Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions irods/api_number.py
Original file line number Diff line number Diff line change
Expand Up @@ -181,4 +181,5 @@
"TOUCH_APN": 20007,
"AUTH_PLUG_REQ_AN": 1201,
"AUTHENTICATION_APN": 110000,
"ZONE_REPORT_AN": 10205,
}
17 changes: 17 additions & 0 deletions irods/manager/zone_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,20 @@ def remove(self, zone_name):
conn.send(request)
response = conn.recv()
logger.debug(response.int_info)

def zone_report(self):
"""
Get zone report.

Requires rodsadmin privileges.

Returns:
dict: Contains zone configuration.
"""
Comment thread
trel marked this conversation as resolved.
message_body = ""
request = iRODSMessage("RODS_API_REQ", msg=message_body, int_info=api_number["ZONE_REPORT_AN"])
with self.sess.pool.get_connection() as conn:
conn.send(request)
response = conn.recv()
logger.debug(response.int_info)
return response.get_json_encoded_struct()
10 changes: 10 additions & 0 deletions irods/test/admin_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,16 @@ def test_create_delete_local_user(self):
with self.assertRaises(UserDoesNotExist):
self.sess.users.get(self.new_user_name)

def test_zone_report(self):
# get zone report
report = self.sess.zones.zone_report()

# confirm it is a dict
self.assertTrue(isinstance(report, dict))

# confirm zone name matches
self.assertEqual(report["zones"][0]["servers"][0]["server_config"]["zone_name"], self.sess.zone)

def test_create_delete_user_zone(self):
# user should not be already present
with self.assertRaises(UserDoesNotExist):
Expand Down
Loading