[#254] Replace use of data_owner_name and data_owner_zone in specific…

… query.
irods · Jan 22, 2024 · 22c43fa · 22c43fa
1 parent 4f304d3
commit 22c43fa
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/packaging/test_plugin_unified_storage_tiering.py b/packaging/test_plugin_unified_storage_tiering.py
@@ -1255,7 +1255,7 @@ def setUp(self):
         super(TestStorageTieringMultipleQueries, self).setUp()
         with session.make_session_for_existing_admin() as admin_session:
             admin_session.assert_icommand('iqdel -a')
-            admin_session.assert_icommand('''iadmin asq "select distinct R_DATA_MAIN.data_name, R_COLL_MAIN.coll_name, R_DATA_MAIN.data_owner_name, R_DATA_MAIN.data_owner_zone, R_DATA_MAIN.data_repl_num from R_DATA_MAIN, R_COLL_MAIN, R_RESC_MAIN, R_OBJT_METAMAP r_data_metamap, R_META_MAIN r_data_meta_main where R_RESC_MAIN.resc_name = 'ufs0' AND r_data_meta_main.meta_attr_name = 'archive_object' AND r_data_meta_main.meta_attr_value = 'yes' AND R_COLL_MAIN.coll_id = R_DATA_MAIN.coll_id AND R_RESC_MAIN.resc_id = R_DATA_MAIN.resc_id AND R_DATA_MAIN.data_id = r_data_metamap.object_id AND r_data_metamap.meta_id = r_data_meta_main.meta_id order by R_COLL_MAIN.coll_name, R_DATA_MAIN.data_name" archive_query''')
+            admin_session.assert_icommand('''iadmin asq "select distinct R_DATA_MAIN.data_name, R_COLL_MAIN.coll_name, R_USER_MAIN.user_name, R_USER_MAIN.zone_name, R_DATA_MAIN.data_repl_num from R_DATA_MAIN inner join R_COLL_MAIN on R_DATA_MAIN.coll_id = R_COLL_MAIN.coll_id inner join R_RESC_MAIN on R_DATA_MAIN.resc_id = R_RESC_MAIN.resc_id inner join R_OBJT_ACCESS r_data_access on R_DATA_MAIN.data_id = r_data_access.object_id inner join R_OBJT_METAMAP r_data_metamap on R_DATA_MAIN.data_id = r_data_metamap.object_id inner join R_META_MAIN r_data_meta_main on r_data_metamap.meta_id = r_data_meta_main.meta_id inner join R_USER_MAIN on r_data_access.user_id = R_USER_MAIN.user_id WHERE R_RESC_MAIN.resc_name = 'ufs0' and r_data_meta_main.meta_attr_name = 'archive_object' and r_data_meta_main.meta_attr_value = 'yes' order by R_COLL_MAIN.coll_name, R_DATA_MAIN.data_name, R_DATA_MAIN.data_repl_num" archive_query''')
 
             admin_session.assert_icommand('iadmin mkresc ufs0 unixfilesystem '+test.settings.HOSTNAME_1 +':/tmp/irods/ufs0', 'STDOUT_SINGLELINE', 'unixfilesystem')
             admin_session.assert_icommand('iadmin mkresc ufs1 unixfilesystem '+test.settings.HOSTNAME_1 +':/tmp/irods/ufs1', 'STDOUT_SINGLELINE', 'unixfilesystem')