DM-34106: bps without specifying iddsServer

bin.src/panda_auth

@@ -35,7 +35,6 @@ if __name__ == "__main__":
         "PANDA_AUTH_VO",
         "PANDA_URL_SSL",
         "PANDA_URL",
-        "IDDS_CONFIG",
     ]:
         if key not in os.environ:
             raise OSError(f"Missing environment variable {key}")

config/bps_idf.yaml

@@ -1,5 +1,5 @@
 #PANDA plugin specific settings:
-iddsServer: "https://aipanda015.cern.ch:443/idds"
+# iddsServer: "https://aipanda015.cern.ch:443/idds"
 placeholderParams: ['qgraphNodeId', 'qgraphId']
 defaultPreCmdOpts: "--long-log --log-level=VERBOSE --log-file payload-log.json"
 

doc/changes/DM-34106.misc.rst

@@ -0,0 +1,2 @@
+Remove iddsServer from bps_idf.yml, to use the idds server defined in panda relay service.
+ Remove IDDS_CONFIG requirements (requiring idds version 0.10.6 and later).

python/lsst/ctrl/bps/panda/panda_auth_utils.py

@@ -77,7 +77,6 @@ def panda_auth_setup():
         "PANDA_AUTH_VO",
         "PANDA_URL_SSL",
         "PANDA_URL",
-        "IDDS_CONFIG",
     ]:
         if key not in os.environ:
             raise OSError(f"Missing environment variable {key}")
@@ -121,7 +120,7 @@ def panda_auth_update(idds_server=None, reset=False):
     ----------
     idds_server : `str`, optional
         URL for the iDDS server.  Defaults to None which means that the
-        underlying functions use any value in the IDDS_CONFIG.
+        underlying functions use any value in the panda relay service.
     reset : `bool`, optional
         Whether to first clean up any previous token.  Defaults to False.
     """

python/lsst/ctrl/bps/panda/panda_service.py

@@ -306,7 +306,7 @@ def run_submission_checks(self):
         Any exception other than NotImplementedError will halt submission.
         Submit directory may not yet exist when this is called.
         """
-        for key in ["PANDA_URL", "IDDS_CONFIG"]:
+        for key in ["PANDA_URL"]:
             if key not in os.environ:
                 raise OSError(f"Missing environment variable {key}")
 

tests/SConscript

@@ -1,10 +1,4 @@
 # -*- python -*-
-import os
 
 from lsst.sconsUtils import env, scripts
 scripts.BasicSConscript.tests(pyList=[])
-
-if "IDDS_CONFIG" in os.environ:
-    env["ENV"]["IDDS_CONFIG"] = os.environ["IDDS_CONFIG"]
-else:
-    env["ENV"]["IDDS_CONFIG"] = f"{os.environ['CTRL_BPS_PANDA_DIR']}/tests/idds_test.cfg"

tests/test_panda_auth_utils.py

@@ -15,7 +15,6 @@ def testPandaAuthStatusWrongEnviron(self):
             "PANDA_AUTH_VO",
             "PANDA_URL_SSL",
             "PANDA_URL",
-            "IDDS_CONFIG",
         }
         test_environ = {key: val for key, val in os.environ.items() if key not in unwanted}
         with mock.patch.dict(os.environ, test_environ, clear=True):