[#54] Fix several scripts that fell behind

Author: alanking

Diff for: federate.py

@@ -83,7 +83,7 @@
         })
 
         # The catalog consumers are only determined after the containers are running
-        zone_info_list = federate.get_info_for_zones(ctx, zone_names, args.consumers_per_zone)
+        zone_info_list = irods_setup.get_info_for_zones(ctx, zone_names, args.consumers_per_zone)
 
         install.make_installer(ctx.platform_name()).install_irods_packages(
             ctx,
@@ -94,7 +94,7 @@
         irods_setup.setup_irods_zones(ctx, zone_info_list, odbc_driver=args.odbc_driver)
 
     else:
-        zone_info_list = federate.get_info_for_zones(ctx, zone_names, args.consumers_per_zone)
+        zone_info_list = irods_setup.get_info_for_zones(ctx, zone_names, args.consumers_per_zone)
 
     federate.form_federation_clique(ctx, zone_info_list, args.federate_consumers)
 

Diff for: install.py

@@ -13,10 +13,10 @@
 
 if __name__ == "__main__":
     import argparse
-    import logs
     import textwrap
 
     import cli
+    from irods_testing_environment import logs
 
     parser = argparse.ArgumentParser(description='Install iRODS packages to a docker-compose project.')
 

Diff for: setup.py

@@ -5,16 +5,16 @@
 import os
 
 # local modules
-import context
-import database_setup
-import irods_setup
+from irods_testing_environment import context
+from irods_testing_environment import database_setup
+from irods_testing_environment import irods_setup
 
 if __name__ == "__main__":
     import argparse
-    import logs
     import textwrap
 
     import cli
+    from irods_testing_environment import logs
 
     parser = argparse.ArgumentParser(description='Setup the iRODS catalog, catalog service provider, and catalog service consumers on a running docker-compose project.')
 
@@ -81,7 +81,7 @@
     logging.debug('provided project name [{}], docker-compose project name [{}]'
                   .format(args.project_name, ctx.compose_project.name))
 
-    if len(compose_project.containers()) is 0:
+    if len(ctx.compose_project.containers()) is 0:
         logging.critical('no containers found for project [directory=[{}], name=[{}]]'
                          .format(os.path.abspath(project_directory), ctx.compose_project.name))