From 5a9dd7670da02e43385bac4bb89e2a5f1d03169e Mon Sep 17 00:00:00 2001 From: Miguel Caballer Date: Wed, 13 Mar 2024 12:48:05 +0100 Subject: [PATCH] Revert "Fix issues" This reverts commit 175750e9f7d3787b22fd719a7064a7d94d17ca17. --- app/__init__.py | 1 + app/egi_catch_all.py | 2 ++ app/tests/test_egi_catch_all.py | 2 ++ 3 files changed, 5 insertions(+) diff --git a/app/__init__.py b/app/__init__.py index 7e9789a32..9bcda149a 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -37,6 +37,7 @@ from app.ssh_key import SSHKey from app.ott import OneTimeTokenData from app import utils, db +from app import appdb as sitesInfo from app.vault_info import VaultInfo from oauthlib.oauth2.rfc6749.errors import InvalidTokenError, TokenExpiredError, InvalidGrantError from werkzeug.exceptions import Forbidden diff --git a/app/egi_catch_all.py b/app/egi_catch_all.py index 842507548..e61f1a72a 100644 --- a/app/egi_catch_all.py +++ b/app/egi_catch_all.py @@ -61,6 +61,8 @@ def get_site_info(site_name): resp = requests.get(site_file, timeout=REQUESTS_TIMEOUT) if resp.status_code == 200: site_info = yaml.safe_load(resp.text) + site_info["gocdb"] + site_info["endpoint"] vos = {} for vo in site_info["vos"]: vos[vo["name"]] = vo["auth"]["project_id"] diff --git a/app/tests/test_egi_catch_all.py b/app/tests/test_egi_catch_all.py index 4aa3c8f16..57e4924a4 100644 --- a/app/tests/test_egi_catch_all.py +++ b/app/tests/test_egi_catch_all.py @@ -17,6 +17,8 @@ # along with this program. If not, see . import unittest +import os +import xmltodict from app import egi_catch_all from mock import patch, MagicMock