Merge pull request #99 from CHIMEFRB/98-bug-pull-failing-to-calculate-size-at-canfar-shouldnt-stop-users-pulling-data

fix(cli): check for luskan status

Author: tjzegmott

dtcli/ps.py

@@ -68,11 +68,15 @@ def ps(
         return None
 
     # Check Canfar status.
-    canfar_up = cadcclient.status()
-    if not canfar_up:
+    minoc_up, luskan_up = cadcclient.status()
+    if not minoc_up:
         error_console.print(
             "Either Minoc is down or certificate is invalid.", style="bold yellow"
         )
+    elif not luskan_up:
+        error_console.print(
+            "Either Luskan is down or certificate is invalid.", style="bold yellow"
+        )
 
     try:
         files, policies = functions.ps(scope, dataset, verbose, quiet)

dtcli/pull.py

@@ -98,11 +98,15 @@ def pull(  # noqa: C901
         return None
 
     # Check Canfar status.
-    canfar_up = cadcclient.status()
-    if not canfar_up:
+    minoc_up, luskan_up = cadcclient.status()
+    if not minoc_up:
         error_console.print(
             "Either Minoc is down or certificate is invalid.", style="bold yellow"
         )
+    elif not luskan_up:
+        error_console.print(
+            "Either Luskan is down or certificate is invalid.", style="bold yellow"
+        )
 
     # Find files missing from localhost.
     console.print(f"\nSearching for files for {dataset} {scope}...\n")
@@ -114,8 +118,7 @@ def pull(  # noqa: C901
         console.print("No files found at minoc.", style="bold red")
         return None
     files_paths = [f.replace("cadc:CHIMEFRB", "") for f in files["missing"]]
-    to_download_size = 0.0
-    if len(files_paths) > 0:
+    if len(files_paths) > 0 and luskan_up:
         common_path = path.commonpath(["/" + f for f in files_paths])
         try:
             to_download_size = cadcclient.size(common_path)
@@ -127,6 +130,10 @@ def pull(  # noqa: C901
 """
             )
             return None
+    elif not luskan_up:
+        to_download_size = -1
+    else:
+        to_download_size = 0
     console.print(
         f" - {len(files['existing'])} files found at {site}.",
         style="green",
@@ -135,10 +142,16 @@ def pull(  # noqa: C901
         f" - {len(files['missing'])} files can be downloaded from minoc.",
         style="yellow",
     )
-    console.print(
-        f"     - Size to download: {to_download_size:.2f} GB.\n",
-        style="yellow",
-    )
+    if luskan_up:
+        console.print(
+            f"     - Size to download: {to_download_size:.2f} GB.\n",
+            style="yellow",
+        )
+    else:
+        console.print(
+            "     - Size to download: [red]Unable to query Luskan[/red].",
+            style="yellow",
+        )
 
     # Confirm download.
     if force:

dtcli/scout.py

@@ -79,11 +79,15 @@ def scout(  # noqa: C901
         return {"error": "No config. Create one with `datatrail config init`."}
 
     # Check Canfar status.
-    canfar_up = cadcclient.status()
-    if not canfar_up:
+    minoc_up, luskan_up = cadcclient.status()
+    if not minoc_up:
         error_console.print(
             "Either Minoc is down or certificate is invalid.", style="bold yellow"
         )
+    elif not luskan_up:
+        error_console.print(
+            "Either Luskan is down or certificate is invalid.", style="bold yellow"
+        )
 
     # Scout dataset.
     endpoint = (

dtcli/utilities/cadcclient.py

@@ -369,30 +369,39 @@ def query(
 
 
 def status(
-    url: str = "https://ws-uv.canfar.net/minoc/capabilities",
     certfile: Optional[str] = None,
-) -> bool:
+) -> Tuple[bool, bool]:
     """Check the status of Minoc.
 
     Args:
-        url: Minoc capabilities HEAD endpoint.
         certfile: Canfar certificate file.
 
     Returns:
         bool: True if Minoc is up, False otherwise.
     """
+    urls: List[str] = [
+        "https://ws-uv.canfar.net/minoc/capabilities",
+        "https://ws-uv.canfar.net/luskan/capabilities",
+    ]
     if not certfile:
         certfile = procure(key="vospace_certfile")
-    response = requests.get(url, cert=certfile, allow_redirects=True)
-    try:
-        response.raise_for_status()
-    except HTTPError as error:
-        logger.error(error)
-        logger.error("Canfar is down.")
-        return False
-    authorised = response.headers.get("x-vo-authenticated")
-    if isinstance(authorised, str):
-        return True
-    else:
-        logger.error("Canfar certificate is not valid.")
-        return False
+    minoc_status = False
+    luskan_status = False
+    for index, url in enumerate(urls):
+        response = requests.get(url, cert=certfile, allow_redirects=True)
+        try:
+            response.raise_for_status()
+            authorised = response.headers.get("x-vo-authenticated")
+            if isinstance(authorised, str):
+                if index == 0:
+                    minoc_status = True
+                else:
+                    luskan_status = True
+            else:
+                raise TypeError
+        except HTTPError as error:
+            logger.error(error)
+            logger.error(f"{url.split('/')[3]} is down.")
+        except TypeError:
+            logger.error("Canfar certificate is not valid.")
+    return minoc_status, luskan_status